Merge pull request #71 from edquist/no-cmd-expansion

tell wordexp not to do command substitution
opensciencegrid · Jun 6, 2018 · 1a8f6f5 · 1a8f6f5
2 parents 1f6ad40 + 7148c91
commit 1a8f6f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/blparser_master.c b/src/blparser_master.c
@@ -146,18 +146,18 @@ check_on_children_args(const struct blah_managed_child *children, const int coun
 			fret = fork();
 			if (fret == 0)
 			{
-				if((j = wordexp(children[i].exefile, &args, 0)))
+				if((j = wordexp(children[i].exefile, &args, WRDE_NOCMD)))
 				{
 					fprintf(stderr,"wordexp: unable to parse the command line \"%s\" (error %d)\n", children[i].exefile, j);
-                			return;
-        			}
+					_exit(1);
+				}
 				/* Child process. Exec exe file. */
 				if (execv(args.we_wordv[0], args.we_wordv) < 0)
 				{
 					fprintf(stderr,"Cannot exec %s: %s\n",
 						children[i].exefile,
 						strerror(errno));
-					exit(1);
+					_exit(1);
 				}
 				/* Free the wordexp'd args */
  				wordfree(&args);

diff --git a/src/mapped_exec.c b/src/mapped_exec.c
@@ -430,7 +430,7 @@ execute_cmd(exec_cmd_t *cmd)
 	}
 
 	/* Do the shell expansion */
-	if(wordexp_err = wordexp(command, &args, 0))
+	if(wordexp_err = wordexp(command, &args, WRDE_NOCMD))
 	{
 		fprintf(stderr,"wordexp: unable to parse the command line \"%s\" (error %d)\n", command, wordexp_err);
 		return(1);

diff --git a/src/mtsafe_popen.c b/src/mtsafe_popen.c
@@ -308,7 +308,7 @@ exe_getouterr(char *const command, char *const environment[], char **cmd_output,
 	envcopy[envcopy_size + i] = (char *)NULL;
 
 	/* Do the shell expansion */
-	if(i = wordexp(command, &args, 0))
+	if(i = wordexp(command, &args, WRDE_NOCMD))
 	{
 		fprintf(stderr,"wordexp: unable to parse the command line \"%s\" (error %d)\n", command, i);
 		return(1);