X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fwhatnow.c;h=4f8d95634b416ad07ef69cff040bf1572e7825d7;hb=e40f90484354303f9ff03878f3b15b3c72b215c2;hp=c60a11c6be67337baf5ffe8d37f7a5b64a69f97a;hpb=5c86fbdc071e1c322ccf341855eaa813807776b4;p=mmh

diff --git a/uip/whatnow.c b/uip/whatnow.c
index c60a11c..4f8d956 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -174,9 +174,8 @@ main(int argc, char **argv)
 		case DISPSW:
 			/* display the msg being replied to or distributed */
 			if ((cp = getenv("mhaltmsg")) && *cp) {
-				snprintf(buf, sizeof buf, "%s '%s'",
-						listproc, cp);
-				system(buf);
+				execprogl(listproc, listproc, "-file", cp,
+						(char *)NULL);
 			} else {
 				advise(NULL, "no alternate message to display");
 			}
@@ -191,8 +190,8 @@ main(int argc, char **argv)
 
 		case LISTSW:
 			/* display the draft file */
-			snprintf(buf, sizeof buf, "%s '%s'", listproc, drft);
-			system(buf);
+			execprogl(listproc, listproc, "-file", drft,
+					(char *)NULL);
 			break;
 
 		case QUITSW:
@@ -269,9 +268,9 @@ main(int argc, char **argv)
 			/*
 			** List attachments on current draft.
 			*/
-			snprintf(buf, sizeof buf, "anno -list -comp '%s' "
-					"-number '%s'", attach_hdr, drft);
-			if (system(buf) != 0) {
+			if (execprogl("anno", "anno", "-list", "-comp",
+					attach_hdr, "-number", drft,
+					(char *)NULL) != 0) {
 				advise(NULL, "Could not list attachment headers.");
 			}
 			break;
@@ -303,34 +302,28 @@ main(int argc, char **argv)
 			** working directory to relative path names.
 			** Add the attachment annotation to the draft.
 			*/
-			if ((f = popen_in_dir(cwd, buf, "r"))) {
-				char buf[BUFSIZ];
+			if (!(f = popen_in_dir(cwd, buf, "r"))) {
+				advise("popen", "could not get file from shell");
+				break;
+			}
 
-				while (fgets(shell, sizeof(shell), f)) {
-					*(strchr(shell, '\n')) = '\0';
+			while (fgets(shell, sizeof(shell), f)) {
+				*(strchr(shell, '\n')) = '\0';
 
-					if (*shell == '/')
-						sprintf(file, "%s", shell);
-					else {
-						sprintf(file, "%s/%s", cwd,
-								shell);
-					}
-					snprintf(buf, sizeof buf,
-							"anno -nodate -append "
-							"-comp '%s' -text '%s'"
-							" '%s'",
-							attach_hdr, file,
-							drft);
-					if (system(buf) != 0) {
-						advise(NULL, "Could not add attachment header.");
-					}
+				if (*shell == '/')
+					sprintf(file, "%s", shell);
+				else {
+					sprintf(file, "%s/%s", cwd, shell);
+				}
+				if (execprogl("anno", "anno",
+						"-nodate", "-append",
+						"-comp", attach_hdr,
+						"-text", file,
+						drft, (char *)NULL) != 0) {
+					advise(NULL, "Could not add attachment header.");
 				}
-
-				pclose(f);
-			} else {
-				advise("popen", "could not get file from shell");
 			}
-
+			pclose(f);
 			break;
 
 		case DETACHCMDSW:
@@ -344,22 +337,20 @@ main(int argc, char **argv)
 			** that the numbering stays correct.
 			*/
 			for (arguments=argp+1; *arguments; arguments++) {
-				char buf[BUFSIZ];
 				int n;
 
 				if (**arguments == '\0') {
 					continue;
 				}
 
-				n = atoi(*arguments);
-				snprintf(buf, sizeof buf, "anno -delete "
-						"-comp '%s' -number '%d' "
-						"'%s'",
-						attach_hdr, n, drft);
-				if (system(buf) != 0) {
+				if (execprogl("anno", "anno", "-delete",
+						"-comp", attach_hdr,
+						"-number", *arguments, drft,
+						(char *)NULL) != 0) {
 					advise(NULL, "Could not delete attachment header.");
 				}
 
+				n = atoi(*arguments);
 				for (argp=arguments+1; *argp; argp++) {
 					if (atoi(*argp) > n) {
 						if (atoi(*argp) == 1) {
@@ -374,8 +365,7 @@ main(int argc, char **argv)
 
 		case WHOMSW:
 			/* list recipients */
-			snprintf(buf, sizeof buf, "%s '%s'", "whom", drft);
-			system(buf);
+			execprogl("whom", "whom", drft, (char *)NULL);
 			break;
 
 		default:
@@ -527,9 +517,9 @@ editfile(char **ed, char **arg, char *file, int use)
 	case OK:
 		vecp = 0;
 		vec[vecp++] = mhbasename(*ed);
-		if (arg)
-			while (*arg)
-				vec[vecp++] = *arg++;
+		while (arg && *arg) {
+			vec[vecp++] = *arg++;
+		}
 		vec[vecp++] = file;
 		vec[vecp] = NULL;
 
@@ -575,36 +565,22 @@ editfile(char **ed, char **arg, char *file, int use)
 static int
 sendfile(char **arg, char *file)
 {
-	pid_t child_id;
-	int vecp;
+	int vecp = 0;
 	char *vec[MAXARGS];
 
-	context_save();  /* save the context file */
+	context_save();
 	fflush(stdout);
 
-	switch (child_id = fork()) {
-	case NOTOK:
-		advise(NULL, "unable to fork, so sending directly...");
-		/* fall */
-	case OK:
-		vecp = 0;
-		vec[vecp++] = "send";
-		if (arg)
-			while (*arg)
-				vec[vecp++] = *arg++;
-		vec[vecp++] = file;
-		vec[vecp] = NULL;
-
-		execvp("send", vec);
-		fprintf(stderr, "%s: unable to exec ", invo_name);
-		perror("send");
-		_exit(-1);
-
-	default:
-		if (pidwait(child_id, OK) == 0)
-			done(0);
-		return 1;
+	vec[vecp++] = "send";
+	while (arg && *arg) {
+		vec[vecp++] = *arg++;
 	}
+	vec[vecp++] = file;
+	vec[vecp] = NULL;
+	execvp(*vec, vec);
+	fprintf(stderr, "%s: unable to exec ", invo_name);
+	perror("send");
+	_exit(-1);
 }
 
 
@@ -614,11 +590,9 @@ sendfile(char **arg, char *file)
 static int
 refile(char **arg, char *file)
 {
-	pid_t pid;
-	register int vecp;
+	int vecp = 0;
 	char *vec[MAXARGS];
 
-	vecp = 0;
 	vec[vecp++] = "refile";
 	vec[vecp++] = "-nolink";  /* override bad .mh_profile defaults */
 	vec[vecp++] = "-file";
@@ -629,23 +603,10 @@ refile(char **arg, char *file)
 	}
 	vec[vecp] = NULL;
 
-	context_save();  /* save the context file */
+	context_save();
 	fflush(stdout);
 
-	switch (pid = fork()) {
-	case -1:
-		advise("fork", "unable to");
-		return -1;
-
-	case 0:
-		execvp(*vec, vec);
-		fprintf(stderr, "%s: unable to exec ", invo_name);
-		perror(*vec);
-		_exit(-1);
-
-	default:
-		return (pidwait(pid, -1));
-	}
+	return execprog(*vec, vec);
 }