X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a..9322ba2854211794c27fae9468768b80b767c211:/sbr/arglist.c

diff --git a/sbr/arglist.c b/sbr/arglist.c
index f40f1e89..e6f079e4 100644
--- a/sbr/arglist.c
+++ b/sbr/arglist.c
@@ -61,33 +61,33 @@ argsplit(char *command, char **file, int *argp)
     if (!space && !metachar) {
     	argvarray[0] = getcpy(r1bindex(command, '/'));
 	argvarray[1] = NULL;
-	*file = getcpy(command);
+	*file = mh_xstrdup(command);
 	if (argp)
 	    *argp = 1;
 	return argvarray;
     }
 
     /*
-     * Spaces, but no shell metacharacters; space-split into seperate
+     * Spaces, but no shell metacharacters; space-split into separate
      * arguments
      */
 
     if (space && !metachar) {
     	char **split;
-	p = getcpy(command);
+	p = mh_xstrdup(command);
 	split = brkstring(p, " \t", NULL);
 	if (split[0] == NULL) {
 	    adios(NULL, "Invalid blank command found");
 	}
-	argvarray[0] = getcpy(r1bindex(split[0], '/'));
+	argvarray[0] = mh_xstrdup(r1bindex(split[0], '/'));
 	for (i = 1; split[i] != NULL; i++) {
 	    if (i > MAXARGS) {
 		adios(NULL, "Command exceeded argument limit");
 	    }
-	    argvarray[i] = getcpy(split[i]);
+	    argvarray[i] = mh_xstrdup(split[i]);
 	}
 	argvarray[i] = NULL;
-	*file = getcpy(split[0]);
+	*file = mh_xstrdup(split[0]);
 	if (argp)
 	    *argp = i;
 	free(p);
@@ -110,12 +110,12 @@ argsplit(char *command, char **file, int *argp)
      *   So we put in a dummy argument (we just use /bin/sh)
      */
 
-    *file = getcpy("/bin/sh");
-    argvarray[0] = getcpy("sh");
-    argvarray[1] = getcpy("-c");
-    argvarray[2] = getcpy(command);
+    *file = mh_xstrdup("/bin/sh");
+    argvarray[0] = mh_xstrdup("sh");
+    argvarray[1] = mh_xstrdup("-c");
+    argvarray[2] = mh_xstrdup(command);
     argvarray[2] = add(" \"$@\"", argvarray[2]);
-    argvarray[3] = getcpy("/bin/sh");
+    argvarray[3] = mh_xstrdup("/bin/sh");
     argvarray[4] = NULL;
 
     if (argp)
@@ -133,8 +133,7 @@ arglist_free(char *command, char **argvarray)
 {
     int i;
 
-    if (command != NULL)
-    	free(command);
+    mh_xfree(command);
 
     if (argvarray != NULL) {
     	for (i = 0; argvarray[i] != NULL; i++)