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

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 914e298..2969397 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -110,7 +110,7 @@ main(int argc, char **argv)
 			switch (smatch(++cp, switches)) {
 			case AMBIGSW:
 				ambigsw(cp, switches);
-				done(1);
+				exit(1);
 			case UNKWNSW:
 				adios(NULL, "-%s unknown", cp);
 
@@ -119,10 +119,10 @@ main(int argc, char **argv)
 						"%s [switches] [file]",
 						invo_name);
 				print_help(buf, switches, 1);
-				done(1);
+				exit(0);
 			case VERSIONSW:
 				print_version(invo_name);
-				done(1);
+				exit(0);
 
 			case EDITRSW:
 				if (!(ed = *argp++) || *ed == '-')
@@ -161,14 +161,15 @@ main(int argc, char **argv)
 				unlink(drft);
 			}
 			advise(NULL, "Try again.");
-			done(1);
+			/* sysexits.h EX_SOFTWARE */
+			exit(1);
 		}
 	}
 
 	snprintf(prompt, sizeof(prompt), myprompt, invo_name);
 	for (;;) {
 		if (!(argp = getans(prompt, aleqs))) {
-			done(1);
+			exit(1);
 		}
 		switch (smatch(*argp, aleqs)) {
 		case DISPSW:
@@ -199,12 +200,12 @@ main(int argc, char **argv)
 			if (stat(drft, &st) != NOTOK) {
 				advise(NULL, "draft left on %s", drft);
 			}
-			done(1);
+			exit(1);
 
 		case DELETESW:
 			/* Delete draft and exit */
 			removefile(drft);
-			done(1);
+			exit(1);
 
 		case SENDSW:
 			/* Send draft */
@@ -214,7 +215,7 @@ main(int argc, char **argv)
 		case REFILEOPT:
 			/* Refile the draft */
 			if (refile(++argp, drft) == 0) {
-				done(0);
+				exit(0);
 			}
 			break;
 
@@ -517,9 +518,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;
 
@@ -565,36 +566,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);
 }
 
 
@@ -604,11 +591,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";
@@ -619,23 +604,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);
 }