X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fshow.c;h=08a9b31cefc25c31295db3df48fe7b8e46e08246;hp=977b0e41ffd131bc914805fbdd917b701303bed9;hb=fb0594cb913cab5e14e2c295b79eb48cc675bbbf;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0

diff --git a/uip/show.c b/uip/show.c
index 977b0e4..08a9b31 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -23,23 +23,17 @@ static struct swit switches[] = {
 	{ "form formfile", 0 },
 #define PROGSW  5
 	{ "moreproc program", 0 },
-#define NPROGSW  6
-	{ "nomoreproc", 0 },
-#define LENSW  7
-	{ "length lines", 0 },
-#define WIDTHSW  8
+#define WIDTHSW  6
 	{ "width columns", 0 },
-#define SHOWSW  9
+#define SHOWSW  7
 	{ "showproc program", 0 },
-#define SHOWMIMESW  10
+#define SHOWMIMESW  8
 	{ "showmimeproc program", 0 },
-#define NSHOWSW  11
-	{ "noshowproc", 0 },
-#define FILESW  12
-	{ "file file", -4 },  /* interface from showfile */
-#define VERSIONSW  13
+#define FILESW  9
+	{ "file file", -4 },  /* interface from lproc (whatnow) */
+#define VERSIONSW  10
 	{ "version", 0 },
-#define HELPSW  14
+#define HELPSW  11
 	{ "help", 0 },
 	{ NULL, 0 }
 };
@@ -49,9 +43,6 @@ static struct swit switches[] = {
 */
 static int is_nontext(char *);
 
-/* prototype from mhlsbr.c */
-int mhl(int, char **);
-
 #define SHOW  0
 #define NEXT  1
 #define PREV  2
@@ -61,9 +52,9 @@ int
 main(int argc, char **argv)
 {
 	int headersw = 1, msgp = 0;
-	int nshow = 0, checkmime = 1, mime;
+	int checkmime = 1, mime;
 	int vecp = 1, procp = 1, mode = SHOW, msgnum;
-	char *cp, *maildir, *file = NULL, *folder = NULL, *proc;
+	char *cp, *file = NULL, *folder = NULL, *proc;
 	char buf[BUFSIZ], **argp, **arguments;
 	char *msgs[MAXARGS], *vec[MAXARGS];
 	struct msgs *mp = NULL;
@@ -87,77 +78,75 @@ main(int argc, char **argv)
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-				case UNKWNSW:
-				case NPROGSW:
-					vec[vecp++] = --cp;
-					continue;
-
-				case HELPSW:
-					snprintf(buf, sizeof(buf), "%s [+folder] %s[switches] [switches for showproc]", invo_name, mode == SHOW ? "[msgs] ": "");
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				case FILESW:
-					if (mode != SHOW)
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				vec[vecp++] = --cp;
+				continue;
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [+folder] %s[switches] [switches for showproc]", invo_name, mode == SHOW ? "[msgs] ": "");
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case FILESW:
+				if (mode != SHOW)
 usage:
-						adios(NULL, "usage: %s [+folder] [switches] [switches for showproc]", invo_name);
-
-					if (file)
-						adios(NULL, "only one file at a time!");
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					file = getcpy(expanddir(cp));
-					continue;
-
-				case HEADSW:
-					headersw++;
-					continue;
-				case NHEADSW:
-					headersw = 0;
-					continue;
-
-				case FORMSW:
-					vec[vecp++] = --cp;
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					vec[vecp++] = getcpy(etcpath(cp));
-					continue;
-
-				case PROGSW:
-				case LENSW:
-				case WIDTHSW:
-					vec[vecp++] = --cp;
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					vec[vecp++] = cp;
-					continue;
-
-				case SHOWSW:
-					if (!(showproc = *argp++) || *showproc == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					nshow = 0;
-					continue;
-				case NSHOWSW:
-					nshow++;
-					continue;
-
-				case SHOWMIMESW:
-					if (!(showmimeproc = *argp++) || *showmimeproc == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					nshow = 0;
-					continue;
-				case CHECKMIMESW:
-					checkmime++;
-					continue;
-				case NOCHECKMIMESW:
-					checkmime = 0;
-					continue;
+					adios(NULL, "usage: %s [+folder] [switches] [switches for showproc]", invo_name);
+
+				if (file)
+					adios(NULL, "only one file at a time!");
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s", argp[-2]);
+				file = getcpy(expanddir(cp));
+				continue;
+
+			case HEADSW:
+				headersw++;
+				continue;
+			case NHEADSW:
+				headersw = 0;
+				continue;
+
+			case FORMSW:
+				vec[vecp++] = --cp;
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				vec[vecp++] = getcpy(etcpath(cp));
+				continue;
+
+			case PROGSW:
+			case WIDTHSW:
+				vec[vecp++] = --cp;
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				vec[vecp++] = cp;
+				continue;
+
+			case SHOWSW:
+				if (!(showproc = *argp++) || *showproc == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case SHOWMIMESW:
+				if (!(showmimeproc = *argp++) ||
+						*showmimeproc == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+			case CHECKMIMESW:
+				checkmime++;
+				continue;
+			case NOCHECKMIMESW:
+				checkmime = 0;
+				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
@@ -190,24 +179,20 @@ usage:
 
 	if (!msgp) {
 		switch (mode) {
-			case NEXT:
-				msgs[msgp++] = "next";
-				break;
-			case PREV:
-				msgs[msgp++] = "prev";
-				break;
-			default:
-				msgs[msgp++] = "cur";
-				break;
+		case NEXT:
+			msgs[msgp++] = seq_next;
+			break;
+		case PREV:
+			msgs[msgp++] = seq_prev;
+			break;
+		default:
+			msgs[msgp++] = seq_cur;
+			break;
 		}
 	}
 
 	if (!folder)
 		folder = getcurfol();
-	maildir = toabsdir(folder);
-
-	if (chdir(maildir) == NOTOK)
-		adios(maildir, "unable to change directory to");
 
 	/* read folder and create message structure */
 	if (!(mp = folder_read(folder)))
@@ -232,7 +217,7 @@ usage:
 			set_unseen(mp, msgnum);
 
 	seq_setprev(mp);  /* set the Previous-Sequence */
-	seq_setunseen(mp, 1);  /* unset the Unseen-Sequence */
+	seq_setunseen(mp, 0);  /* unset unseen seqs for shown msgs */
 
 	if (mp->numsel > MAXARGS - 2)
 		adios(NULL, "more than %d messages for show exec",
@@ -244,7 +229,7 @@ usage:
 
 	seq_setcur(mp, mp->hghsel);  /* update current message  */
 	seq_save(mp);  /* synchronize sequences   */
-	context_replace(pfolder, folder);  /* update current folder   */
+	context_replace(curfolder, folder);  /* update current folder   */
 	context_save();  /* save the context file   */
 
 	if (headersw && vecp == 2)
@@ -259,87 +244,53 @@ go_to_it: ;
 	** Decide which "proc" to use
 	*/
 	mime = 0;
-	if (nshow) {
-		proc = catproc;
-	} else {
-		/* check if any messages are non-text MIME messages */
-		if (checkmime && !getenv("NOMHNPROC")) {
-			if (!file) {
-				/*
-				** loop through selected messages
-				** and check for MIME
-				*/
-				for (msgnum = mp->lowsel;
-						msgnum <= mp->hghsel;
-						msgnum++)
-					if (is_selected(mp, msgnum) && is_nontext(m_name(msgnum))) {
-						mime = 1;
-						break;
-					}
-			} else {
-				/* check the file for MIME */
-				if (is_nontext(vec[vecp - 1]))
+	/* check if any messages are non-text MIME messages */
+	if (checkmime) {
+		if (!file) {
+			/*
+			** loop through selected messages
+			** and check for MIME
+			*/
+			for (msgnum = mp->lowsel;
+					msgnum <= mp->hghsel;
+					msgnum++)
+				if (is_selected(mp, msgnum) && is_nontext(m_name(msgnum))) {
 					mime = 1;
-			}
+					break;
+				}
+		} else {
+			/* check the file for MIME */
+			if (is_nontext(vec[vecp - 1]))
+				mime = 1;
 		}
-
-		/* Set the "proc" */
-		if (mime)
-			proc = showmimeproc;
-		else
-			proc = showproc;
 	}
 
+	/* Set the "proc" */
+	proc = (mime) ? showmimeproc : showproc;
+
 	if (folder && !file)
 		m_putenv("mhfolder", folder);
 
-	/*
-	** For backward compatibility, if the "proc" is mhn,
-	** then add "-show" option.  Add "-file" if showing
-	** file.
-	*/
-	if (strcmp(mhbasename(proc), "mhn") == 0) {
+	/* Special-cased because mhshow takes msg not files args. */
+	if (strcmp(mhbasename(proc), "mhshow")==0) {
 		if (file) {
 			vec[vecp] = vec[vecp - 1];
 			vec[vecp - 1] = "-file";
-			vecp++;
+			vec[++vecp] = NULL;
 		}
-		vec[vecp++] = "-show";
+		vec[vecp++] = concat("+", folder, NULL);
 		vec[vecp] = NULL;
+		vec[0] = mhbasename(proc);
+		execvp(proc, vec);
+		adios(proc, "unable to exec");
 	}
 
-	/* If the "proc" is "mhshow", add "-file" if showing file.  */
-	if (strcmp(mhbasename(proc), "mhshow") == 0 && file ) {
-	   vec[vecp] = vec[vecp - 1];
-	   vec[vecp - 1] = "-file";
-	   vec[++vecp] = NULL;
-	}
-
-	/*
-	** If "proc" is mhl, then run it internally
-	** rather than exec'ing it.
-	*/
-	if (strcmp(mhbasename(proc), "mhl") == 0) {
-		vec[0] = "mhl";
-		mhl(vecp, vec);
-		done(0);
-	}
-
-	/*
-	** If you are not using a nmh command as your "proc", then
-	** add the path to the message names.  Currently, we are just
-	** checking for mhn here, since we've already taken care of mhl.
-	*/
-	if (!strcmp(mhbasename(proc), "mhl")
-			&& !file
-			&& chdir(maildir =
-			concat(toabsdir("+"), "/", NULL)) != NOTOK) {
-		mp->foldpath = concat(mp->foldpath, "/", NULL);
-		cp = isprefix(maildir, mp->foldpath)
-			? mp->foldpath + strlen(maildir)
-			: mp->foldpath;
-		for (msgnum = procp; msgnum < vecp; msgnum++)
-			vec[msgnum] = concat(cp, vec[msgnum], NULL);
+	/* Add the path to the message names. */
+	if (!file) {
+		for (msgnum = procp; msgnum < vecp; msgnum++) {
+			vec[msgnum] = concat(mp->foldpath, "/",
+					vec[msgnum], NULL);
+		}
 	}
 
 	vec[0] = mhbasename(proc);