Use execprog() instead of system() ... partly transition

[mmh] / uip / whatnow.c

diff --git a/uip/whatnow.c b/uip/whatnow.c
index c60a11c..ff9d84c 100644 (file)
--- 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;
@@ -304,8 +303,6 @@ main(int argc, char **argv)
                        ** Add the attachment annotation to the draft.
                        */
                        if ((f = popen_in_dir(cwd, buf, "r"))) {
-                               char buf[BUFSIZ];
-
                                while (fgets(shell, sizeof(shell), f)) {
                                        *(strchr(shell, '\n')) = '\0';
 
@@ -315,13 +312,13 @@ main(int argc, char **argv)
                                                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) {
+                                       if (execprogl("anno", "anno",
+                                                       "-nodate",
+                                                       "-append", "-comp",
+                                                       attach_hdr, "-text",
+                                                       file, drft,
+                                                       (char *)NULL)
+                                                       != 0) {
                                                advise(NULL, "Could not add attachment header.");
                                        }
                                }
@@ -344,22 +341,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 +369,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: