X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fwhatnow.c;h=914e2989cb6d08faa460cc640138e7320f9b5b0c;hp=6cb96f775a286d64c57848999b2b40242f8e3abc;hb=6e5da31c92f5a3fa38e010052c5a7743bfe1cf11;hpb=4246358611c366d8f9458afd5b121c2e5cf54aa1

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 6cb96f7..914e298 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -4,35 +4,6 @@
 ** This code is Copyright (c) 2002, by the authors of nmh.  See the
 ** COPYRIGHT file in the root directory of the nmh distribution for
 ** complete copyright information.
-**
-**  The inclusion of attachments is eased by
-**  using the header field name mechanism added to anno and send.
-**  The header field name for attachments is predefined.
-**
-**  Several commands have been added at the whatnow prompt:
-**
-**        cd [ directory ]        This option works just like the shell's
-**                                cd command and lets the user change the
-**                                directory from which attachments are
-**                                taken so that long path names are not
-**                                needed with every file.
-**
-**        ls [ ls-options ]       This option works just like the normal
-**                                ls command and exists to allow the user
-**                                to verify file names in the directory.
-**
-**        pwd                     This option works just like the normal
-**                                pwd command and exists to allow the user
-**                                to verify the directory.
-**
-**        attach files            This option attaches the named files to
-**                                the draft.
-**
-**        alist                   This option lists the attachments on the
-**                                draft.
-**
-**        detach numbers          This option removes attachments by
-**                                attachment number from the draft.
 */
 
 #include <h/mh.h>
@@ -98,9 +69,9 @@ static int sendfile(char **, char *);
 static int refile(char **, char *);
 static int removefile(char *);
 static void writelscmd(char *, int, char **);
-static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
-static FILE* popen_in_dir(const char *dir, const char *cmd, const char *type);
-static int system_in_dir(const char *dir, const char *cmd);
+static void writesomecmd(char *, int, char *, char *, char **);
+static FILE* popen_in_dir(const char *, const char *, const char *);
+static int system_in_dir(const char *, const char *);
 
 
 int
@@ -203,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");
 			}
@@ -220,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:
@@ -298,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;
@@ -332,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:
@@ -373,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) {
@@ -403,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: