X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fwhatnow.c;h=f26dcb7c00e48e4e604a3fa8d290870de8ce3c70;hb=8bdc45422ae3279fde81b1d1e7eb9dcf881f961f;hp=874a787417f0667bfcda79962198cc3757a083ff;hpb=f8960957ae53f962fe12e5a5eb4c01eb54cb4228;p=mmh

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 874a787..f26dcb7 100644
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -28,9 +28,8 @@
 **        attach files            This option attaches the named files to
 **                                the draft.
 **
-**        alist [-ln]             This option lists the attachments on the
-**                                draft.  -l gets long listings, -n gets
-**                                numbered listings.
+**        alist                   This option lists the attachments on the
+**                                draft.
 **
 **        detach files            This option removes attachments from the
 **        detach -n numbers       draft.  This can be done by file name or
@@ -46,13 +45,11 @@
 static struct swit whatnowswitches[] = {
 #define EDITRSW  0
 	{ "editor editor", 0 },
-#define NEDITSW  1
-	{ "noedit", 0 },
-#define PRMPTSW  2
+#define PRMPTSW  1
 	{ "prompt string", 4 },
-#define VERSIONSW  3
+#define VERSIONSW  2
 	{ "version", 0 },
-#define HELPSW  4
+#define HELPSW  3
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -71,24 +68,22 @@ static struct swit aleqs[] = {
 	{ "list", 0 },
 #define SENDSW  4
 	{ "send [<switches>]", 0 },
-#define PUSHSW  5
-	{ "push [<switches>]", 0 },
-#define QUITSW  6
+#define QUITSW  5
 	{ "quit", 0 },
-#define DELETESW  7
+#define DELETESW  6
 	{ "delete", 0 },
-#define CDCMDSW  8
+#define CDCMDSW  7
 	{ "cd [directory]", 0 },
-#define PWDCMDSW  9
+#define PWDCMDSW  8
 	{ "pwd", 0 },
-#define LSCMDSW  10
+#define LSCMDSW  9
 	{ "ls", 0 },
-#define ATTACHCMDSW  11
+#define ATTACHCMDSW  10
 	{ "attach", 0 },
-#define DETACHCMDSW  12
-	{ "detach [-n]", 2 },
-#define ALISTCMDSW  13
-	{ "alist [-ln] ", 2 },
+#define DETACHCMDSW  11
+	{ "detach [-n]", 0 },
+#define ALISTCMDSW  12
+	{ "alist", 0 },
 	{ NULL, 0 }
 };
 
@@ -98,8 +93,9 @@ static char *myprompt = "\nWhat now? ";
 ** static prototypes
 */
 static int editfile(char **, char **, char *, int, struct msgs *,
-	char *, char *, int);
-static int sendfile(char **, char *, int);
+	char *, char *);
+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);
@@ -115,7 +111,7 @@ static int copyf(char *, char *);
 int
 main(int argc, char **argv)
 {
-	int nedit = 0, use = 0;
+	int use = 0;
 	char *cp;
 	char *ed = NULL, *drft = NULL, *msgnam = NULL;
 	char buf[BUFSIZ], prompt[BUFSIZ];
@@ -125,8 +121,7 @@ main(int argc, char **argv)
 	char file[MAXPATHLEN + 1];  /* file name buffer */
 	char shell[MAXPATHLEN + 1];  /* shell response buffer */
 	FILE *f;  /* read pointer for bgnd proc */
-	char *l;  /* set on -l to alist  command */
-	int n;  /* set on -n to alist command */
+	int n;  /* set on -n to detach command */
 
 #ifdef LOCALE
 	setlocale(LC_ALL, "");
@@ -171,10 +166,6 @@ main(int argc, char **argv)
 				if (!(ed = *argp++) || *ed == '-')
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
-				nedit = 0;
-				continue;
-			case NEDITSW:
-				nedit++;
 				continue;
 
 			case PRMPTSW:
@@ -199,15 +190,20 @@ main(int argc, char **argv)
 	if ((cp = getenv("mhuse")) && *cp)
 		use = atoi(cp);
 
-	if (!ed && (!(ed = getenv("mheditor")) || !*ed)) {
-		ed = NULL;
-		nedit++;
+	if (!ed && !(ed = getenv("mheditor"))) {
+		ed = "";  /* Don't initially edit the draft */
 	}
 
-	/* start editing the draft, unless -noedit was given */
-	if (!nedit && editfile(&ed, NULL, drft, use, NULL, msgnam, NULL, 1)
-			< 0)
-		done(1);
+	/* start editing the draft, unless editor is the empty string */
+	if (*ed) {
+		if (editfile(&ed, NULL, drft, use, NULL, msgnam, NULL) <0) {
+			if (!use) {
+				unlink(drft);
+			}
+			advise(NULL, "Try again.");
+			done(1);
+		}
+	}
 
 	snprintf(prompt, sizeof(prompt), myprompt, invo_name);
 	for (;;) {
@@ -231,9 +227,7 @@ main(int argc, char **argv)
 			/* Call an editor on the draft file */
 			if (*++argp)
 				ed = *argp++;
-			if (editfile(&ed, argp, drft, NOUSE, NULL,
-					msgnam, NULL, 1) == NOTOK)
-				done(1);
+			editfile(&ed, argp, drft, NOUSE, NULL, msgnam, NULL);
 			break;
 
 		case LISTSW:
@@ -254,21 +248,16 @@ main(int argc, char **argv)
 			removefile(drft);
 			done(1);
 
-		case PUSHSW:
-			/* Send draft in background */
-			if (sendfile(++argp, drft, 1))
-				done(1);
-			break;
-
 		case SENDSW:
 			/* Send draft */
-			sendfile(++argp, drft, 0);
+			sendfile(++argp, drft);
 			break;
 
 		case REFILEOPT:
 			/* Refile the draft */
-			if (refile(++argp, drft) == 0)
+			if (refile(++argp, drft) == 0) {
 				done(0);
+			}
 			break;
 
 		case CDCMDSW:
@@ -319,38 +308,14 @@ main(int argc, char **argv)
 
 		case ALISTCMDSW:
 			/*
-			** List attachments on current draft.  Options are:
-			**
-			** -l    long listing (full path names)
-			** -n    numbers listing
+			** List attachments on current draft.
 			*/
-
-			l = NULL;
-			n = 0;
-
-			while (*++argp) {
-				if (strcmp(*argp, "-l") == 0)
-					l = "/";
-
-				else if (strcmp(*argp, "-n") == 0)
-					n = 1;
-
-				else if (strcmp(*argp, "-ln") == 0 ||
-						strcmp(*argp, "-nl") == 0) {
-					l = "/";
-					n = 1;
-				} else {
-					n = -1;
-					break;
-				}
+			snprintf(buf, sizeof buf, "anno -list -comp '%s' "
+					"-number all -text IGNORE '%s'",
+					attach_hdr, drft);
+			if (system(buf) != 0) {
+				advise(NULL, "Could not list attachment headers.");
 			}
-
-			if (n == -1)
-				advise(NULL, "usage is alist [-ln].");
-
-			else
-				annolist(drft, attach_hdr, l, n);
-
 			break;
 
 		case ATTACHCMDSW:
@@ -381,6 +346,8 @@ 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';
 
@@ -390,8 +357,15 @@ main(int argc, char **argv)
 						sprintf(file, "%s/%s", cwd,
 								shell);
 					}
-					annotate(drft, attach_hdr, file, 0,
-							-2, 1, 0);
+					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.");
+					}
 				}
 
 				pclose(f);
@@ -409,7 +383,6 @@ main(int argc, char **argv)
 			** names and numbers aren't allowed, so this
 			** catches a -n anywhere in the argument list.
 			*/
-
 			for (n = 0, arguments = argp + 1;
 					*arguments != NULL;
 					arguments++) {
@@ -426,21 +399,23 @@ main(int argc, char **argv)
 			** just processed after processing each one so
 			** that the numbering stays correct.
 			*/
-
 			if (n == 1) {
-				for (arguments = argp + 1;
-						*arguments != NULL;
+				for (arguments=argp+1; *arguments;
 						arguments++) {
 					if (strcmp(*arguments, "-n") == 0)
 						continue;
 
 					if (**arguments != '\0') {
+						char buf[BUFSIZ];
+
 						n = atoi(*arguments);
-						annotate(drft, attach_hdr,
-								NULL, 0,
-								n, 1, 0);
+						snprintf(buf, sizeof buf, "anno -delete -comp '%s' -number '%d' '%s'", attach_hdr, n, drft);
+						if (system(buf) != 0) {
+							advise(NULL, "Could not delete attachment header.");
+						}
 
-						for (argp = arguments + 1; *argp; argp++) {
+						for (argp=arguments+1; *argp;
+								argp++) {
 							if (atoi(*argp) > n) {
 								if (atoi(*argp) == 1)
 									*argp = "";
@@ -450,7 +425,9 @@ main(int argc, char **argv)
 						}
 					}
 				}
+				break;
 			}
+			/* else */
 
 			/*
 			** The arguments are interpreted as file names.
@@ -468,8 +445,14 @@ main(int argc, char **argv)
 			if ((f = popen_in_dir(cwd, buf, "r"))) {
 				while (fgets(shell, sizeof (shell), f)) {
 					*(strchr(shell, '\n')) = '\0';
-					annotate(drft, attach_hdr, shell,
-							0, 0, 1, 0);
+					snprintf(buf, sizeof buf,
+							"anno -delete -comp "
+							"'%s' -text '%s' '%s'",
+							attach_hdr, shell,
+							drft);
+					if (system(buf) != 0) {
+						advise(NULL, "Could not delete attachment header.");
+					}
 				}
 				pclose(f);
 			} else {
@@ -588,13 +571,12 @@ popen_in_dir(const char *dir, const char *cmd, const char *type)
 ** EDIT
 */
 
-static int  reedit = 0;  /* have we been here before? */
 static char *edsave = NULL;  /* the editor we used previously */
 
 
 static int
 editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
-	char *altmsg, char *cwd, int save_editor)
+	char *altmsg, char *cwd)
 {
 	int pid, status, vecp;
 	char altpath[BUFSIZ], linkpath[BUFSIZ];
@@ -605,21 +587,22 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 	int slinked = 0;
 #endif /* HAVE_LSTAT */
 
-	/* Was there a previous edit session? */
-	if (reedit) {
-		if (!*ed) {  /* no explicit editor */
-			*ed = edsave;  /* so use the previous one */
+	if (!*ed || !**ed) {
+		/* We have no explicit editor. */
+		if (edsave) {
+			/* Use the previous editor ... */
+			*ed = edsave;
 			if (!(cp = mhbasename(*ed)))
 				cp = *ed;
 
-			/* unless we've specified it via "editor-next" */
+			/* but prefer one specified via "editor-next" */
 			cp = concat(cp, "-next", NULL);
 			if ((cp = context_find(cp)))
 				*ed = cp;
+		} else {
+			/* set initial editor */
+			*ed = defaulteditor;
 		}
-	} else if (!*ed) {
-		/* set initial editor */
-		*ed = defaulteditor;
 	}
 
 	if (altmsg) {
@@ -633,9 +616,6 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 		else
 			snprintf(linkpath, sizeof(linkpath), "%s/%s",
 					cwd, altmsglink);
-	}
-
-	if (altmsg) {
 		unlink(linkpath);
 #ifdef HAVE_LSTAT
 		if (link(altpath, linkpath) == NOTOK) {
@@ -676,25 +656,30 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 		vec[vecp] = NULL;
 
 		execvp(*ed, vec);
-		fprintf(stderr, "unable to exec ");
+		fprintf(stderr, "%s: unable to exec ", invo_name);
 		perror(*ed);
 		_exit(-1);
 
 	default:
 		if ((status = pidwait(pid, NOTOK))) {
-			if (((status & 0xff00) != 0xff00)
-				&& (!reedit || (status & 0x00ff))) {
-				if (!use && (status & 0xff00) && (rename(file, cp = m_backup (file)) != NOTOK)) {
-					advise(NULL, "problems with edit--draft left in %s", cp);
-				} else {
-					advise(NULL, "problems with edit--%s preserved", file);
-				}
+			if ((status & 0xff00) == 0xff00) {
+				/* cmd not found or pidwait() failed */
+				status = -1;
+				break;
+			}
+			if (status & 0x00ff) {
+				/* terminated by signal */
+				advise(NULL, "%s terminated by signal %d",
+						*ed, status & 0x7f);
+			} else {
+				/* failure exit */
+				advise(NULL, "%s exited with return code %d",
+						*ed, (status & 0xff00) >> 8);
 			}
-			status = -2;  /* maybe "reedit ? -2 : -1"? */
+			status = -1;
 			break;
 		}
 
-		reedit++;
 #ifdef HAVE_LSTAT
 		if (altmsg && mp && !is_readonly(mp) && (slinked ?
 				lstat (linkpath, &st) != NOTOK &&
@@ -715,13 +700,13 @@ editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
 #endif /* HAVE_LSTAT */
 	}
 
-	/* normally, we remember which editor we used */
-	if (save_editor)
-		edsave = getcpy(*ed);
+	/* remember which editor we used */
+	edsave = getcpy(*ed);
 
 	*ed = NULL;
-	if (altmsg)
+	if (altmsg) {
 		unlink(linkpath);
+	}
 
 	return status;
 }
@@ -761,7 +746,7 @@ copyf(char *ifile, char *ofile)
 */
 
 static int
-sendfile(char **arg, char *file, int pushsw)
+sendfile(char **arg, char *file)
 {
 	pid_t child_id;
 	int vecp;
@@ -777,8 +762,6 @@ sendfile(char **arg, char *file, int pushsw)
 	case OK:
 		vecp = 0;
 		vec[vecp++] = invo_name;
-		if (pushsw)
-			vec[vecp++] = "-push";
 		if (arg)
 			while (*arg)
 				vec[vecp++] = *arg++;
@@ -786,7 +769,7 @@ sendfile(char **arg, char *file, int pushsw)
 		vec[vecp] = NULL;
 
 		execvp("send", vec);
-		fprintf(stderr, "unable to exec ");
+		fprintf(stderr, "%s: unable to exec ", invo_name);
 		perror("send");
 		_exit(-1);
 
@@ -799,6 +782,47 @@ sendfile(char **arg, char *file, int pushsw)
 
 
 /*
+** refile msg into another folder
+*/
+static int
+refile(char **arg, char *file)
+{
+	pid_t pid;
+	register int vecp;
+	char *vec[MAXARGS];
+
+	vecp = 0;
+	vec[vecp++] = "refile";
+	vec[vecp++] = "-nolink";  /* override bad .mh_profile defaults */
+	vec[vecp++] = "-file";
+	vec[vecp++] = file;
+
+	while (arg && *arg) {
+		vec[vecp++] = *arg++;
+	}
+	vec[vecp] = NULL;
+
+	context_save();  /* save the context file */
+	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));
+	}
+}
+
+
+/*
 ** Remove the draft file
 */