f9e2bf7c6b
Fixes #8195. This PR doesn't fix all the warnings from #8195, but fixes many of them (e.g., I didn't get the "string might be truncated" warnings on my Mac). This is an adaptation of 14aa5fae3c42f14a1c6a259dede93d5ca7ecb82c from master; it drops some things that aren't relevant here on the v4.1.x branch and adds a few more warnings fixes that are relevant here on v4.1.x that aren't relevant on master. Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry-picked from 14aa5fae3c42f14a1c6a259dede93d5ca7ecb82c)
105 строки
2.8 KiB
C
105 строки
2.8 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
* All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include <string.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif /* HAVE_UNISTD_H */
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
#include <sys/param.h>
|
|
#endif /* HAVE_SYS_PARAM_H */
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
|
|
#include "opal/util/os_path.h"
|
|
|
|
static const char *path_sep = OPAL_PATH_SEP;
|
|
|
|
char *opal_os_path(int relative, ...)
|
|
{
|
|
va_list ap;
|
|
char *element, *path;
|
|
size_t num_elements, total_length;
|
|
|
|
va_start(ap, relative);
|
|
|
|
/* no way to protect ourselves from reading too far, so have to
|
|
trust caller that they ended the list with the NULL */
|
|
|
|
num_elements = 0;
|
|
total_length = 0;
|
|
while (NULL != (element = va_arg(ap, char*))) {
|
|
num_elements++;
|
|
total_length = total_length + strlen(element);
|
|
if( path_sep[0] != element[0] ) total_length++;
|
|
}
|
|
va_end(ap);
|
|
|
|
if (0 == num_elements) { /* must be looking for a simple answer */
|
|
path = (char *)malloc(3);
|
|
path[0] = '\0';
|
|
if (relative) {
|
|
strcpy(path, ".");
|
|
strcat(path, path_sep);
|
|
} else {
|
|
strcpy(path, path_sep);
|
|
}
|
|
return(path);
|
|
}
|
|
|
|
/* setup path with enough room for the string terminator, the elements, and
|
|
the separator between each of the elements */
|
|
total_length = total_length + num_elements * strlen(path_sep) + 1;
|
|
if(relative) {
|
|
total_length++;
|
|
}
|
|
|
|
if (total_length > OPAL_PATH_MAX) { /* path length is too long - reject it */
|
|
return(NULL);
|
|
}
|
|
|
|
path = (char *)malloc(total_length);
|
|
if (NULL == path) {
|
|
return(NULL);
|
|
}
|
|
path[0] = 0;
|
|
|
|
if (relative) {
|
|
strcpy(path, ".");
|
|
}
|
|
|
|
va_start(ap, relative);
|
|
if( NULL != (element = va_arg(ap, char*)) ) {
|
|
if (path_sep[0] != element[0]) {
|
|
strcat(path, path_sep);
|
|
}
|
|
strcat(path, element);
|
|
}
|
|
while (NULL != (element=va_arg(ap, char*))) {
|
|
if (path_sep[0] != element[0]) {
|
|
strcat(path, path_sep);
|
|
}
|
|
strcat(path, element);
|
|
}
|
|
|
|
va_end(ap);
|
|
return opal_make_filename_os_friendly(path);
|
|
}
|