Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/fe/startup/parse_launcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,7 @@ int ModifyArgv::modifyCmdLine()
char options_str[32];
snprintf(options_str, 32, "%lu", (unsigned long) params->opts);
string options(options_str);

int rc = getFirstValidPath( params->commpaths, &( params->commpath ), params->number );
if( rc != 0 ){
return -1;
}
string commpath(params->commpath);
int rc;

char number_str[32];
snprintf(number_str, 32, "%lu", (unsigned long) params->number);
Expand All @@ -323,7 +318,7 @@ int ModifyArgv::modifyCmdLine()
if (p == parser->appExecutableAt()) {
#if defined(os_bluegene)
string bg_env_str = parser->getParser()->getBGString();
parser->getParser()->addBGEnvStr(n, new_argv, bg_env_str, default_libstr, intercept_libstr, commpath, number, options, shmcache_size);
parser->getParser()->addBGEnvStr(n, new_argv, bg_env_str, default_libstr, intercept_libstr, params->commpaths, number, options, shmcache_size);
#else
char **a_argv;
int a_argc;
Expand Down
1 change: 1 addition & 0 deletions src/server/auditserver/ldcs_audit_server_filemngt.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ static char *filemngt_normalize_dir(char *dir) {
int ldcs_audit_server_filemngt_init (char *cachepath, char *commpath) {
int rc=0;

debug_printf2("Setting cachepath to '%s' and commpath to '%s'\n", cachepath, commpath);
_ldcs_audit_server_cachepath = cachepath;
_ldcs_audit_server_commpath = commpath;
if (-1 == spindle_mkdir(_ldcs_audit_server_cachepath)) {
Expand Down
2 changes: 1 addition & 1 deletion src/utils/parseloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ static int validateCandidatePath( char *candidatePath, char **realizedPath, char
if( parsedCandidatePath ){
realizedCandidatePath = realize( parsedCandidatePath );
if( realizedCandidatePath ){
rc = spindle_mkdir( parsedCandidatePath );
rc = spindle_mkdir( realizedCandidatePath );
if( 0 == rc ){
// candidatePath is going to be freed in the calling function.
// symbolicPath needs a strdup(). parsedPath() and realizedPath()
Expand Down
7 changes: 5 additions & 2 deletions src/utils/spindle_mkdir.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,10 @@ int spindle_mkdir(char *orig_path)
}
else {
debug_printf3("Did a mkdir(%s)\n", path);
}
#if defined(TRACK_MKDIR)
track_mkdir(path);
track_mkdir(path);
#endif
}
}
path[i] = orig_char;

Expand All @@ -160,6 +160,9 @@ int spindle_mkdir(char *orig_path)
if (checkdir(path) == -1) {
return -1;
}
#if defined(TRACK_MKDIR)
track_mkdir(path);
#endif
}
return 0;
}
Expand Down
Loading