X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=44c32a02964090c96b1e6a6205d60fecb40bf706;hp=3ce0b216f0a18f1e130671cc67c7a86362558123;hb=c8195849d2e366c569271abb0f5f60f4ebf0b4d0;hpb=682962d94b21e120c78a52a8bdcb6aa994330a14

diff --git a/uip/forw.c b/uip/forw.c
index 3ce0b21..44c32a0 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -33,37 +33,29 @@ static struct swit switches[] = {
 	{ "format", 5 },
 #define NFRMTSW  7
 	{ "noformat", 7 },
-#define INPLSW  8
-	{ "inplace", 0 },
-#define NINPLSW  9
-	{ "noinplace", 0 },
-#define MIMESW  10
+#define MIMESW  8
 	{ "mime", 0 },
-#define NMIMESW  11
+#define NMIMESW  9
 	{ "nomime", 0 },
-#define DGSTSW  12
+#define DGSTSW  10
 	{ "digest list", 0 },
-#define ISSUESW  13
+#define ISSUESW  11
 	{ "issue number", 0 },
-#define VOLUMSW  14
+#define VOLUMSW  12
 	{ "volume number", 0 },
-#define WHATSW  15
+#define WHATSW  13
 	{ "whatnowproc program", 0 },
-#define NWHATSW  16
+#define NWHATSW  14
 	{ "nowhatnowproc", 0 },
-#define BITSTUFFSW  17
-	{ "dashstuffing", 0 },  /* interface to mhl */
-#define NBITSTUFFSW  18
-	{ "nodashstuffing", 0 },
-#define VERSIONSW  19
+#define VERSIONSW  15
 	{ "version", 0 },
-#define HELPSW  20
+#define HELPSW  16
 	{ "help", 0 },
-#define FILESW  21
+#define FILESW  17
 	{ "file file", 4 },  /* interface from msh */
 
 #ifdef MHE
-#define BILDSW  22
+#define BILDSW  18
 	{ "build", 5 },  /* interface from mhe */
 #endif /* MHE */
 
@@ -83,17 +75,17 @@ static struct msgs *mp = NULL;  /* used a lot */
 /*
 ** static prototypes
 */
-static void mhl_draft(int, char *, int, int, char *, char *, int);
-static void copy_draft(int, char *, char *, int, int, int);
-static void copy_mime_draft(int);
+static void mhl_draft(int, char *, int, int, char *, char *);
+static void copy_draft(int, char *, char *, int, int);
+static void add_forw_hdr(char *);
 static int build_form(char *, char *, int, int);
 
 
 int
 main(int argc, char **argv)
 {
-	int msgp = 0, anot = 0, inplace = 1, mime = 0;
-	int issue = 0, volume = 0, dashstuff = 0;
+	int msgp = 0, anot = 0, mime = 0;
+	int issue = 0, volume = 0;
 	int nedit = 0, nwhat = 0, in;
 	int out, msgnum;
 	char *cp, *cwd, *maildir;
@@ -120,113 +112,110 @@ main(int argc, char **argv)
 	while ((cp = *argp++)) {
 		if (*cp == '-') {
 			switch (smatch(++cp, switches)) {
-				case AMBIGSW:
-					ambigsw(cp, switches);
-					done(1);
-				case UNKWNSW:
-					adios(NULL, "-%s unknown", cp);
-
-				case HELPSW:
-					snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
-					print_help(buf, switches, 1);
-					done(1);
-				case VERSIONSW:
-					print_version(invo_name);
-					done(1);
-
-				case ANNOSW:
-					anot++;
-					continue;
-				case NANNOSW:
-					anot = 0;
-					continue;
-
-				case EDITRSW:
-					if (!(ed = *argp++) || *ed == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					nedit = 0;
-					continue;
-				case NEDITSW:
-					nedit++;
-					continue;
-
-				case WHATSW:
-					if (!(whatnowproc = *argp++) || *whatnowproc == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					nwhat = 0;
-					continue;
+			case AMBIGSW:
+				ambigsw(cp, switches);
+				done(1);
+			case UNKWNSW:
+				adios(NULL, "-%s unknown", cp);
+
+			case HELPSW:
+				snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+				print_help(buf, switches, 1);
+				done(1);
+			case VERSIONSW:
+				print_version(invo_name);
+				done(1);
+
+			case ANNOSW:
+				anot++;
+				continue;
+			case NANNOSW:
+				anot = 0;
+				continue;
+
+			case EDITRSW:
+				if (!(ed = *argp++) || *ed == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				nedit = 0;
+				continue;
+			case NEDITSW:
+				nedit++;
+				continue;
+
+			case WHATSW:
+				if (!(whatnowproc = *argp++) ||
+						*whatnowproc == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				nwhat = 0;
+				continue;
 #ifdef MHE
-				case BILDSW:
-					buildsw++;  /* fall... */
+			case BILDSW:
+				buildsw++;  /* fall... */
 #endif /* MHE */
-				case NWHATSW:
-					nwhat++;
-					continue;
-
-				case FILESW:
-					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 FILTSW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					filter = getcpy(etcpath(cp));
-					mime = 0;
-					continue;
-				case FORMSW:
-					if (!(form = *argp++) || *form == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					continue;
-
-				case FRMTSW:
-					filter = getcpy(etcpath(mhlforward));
-					continue;
-				case NFRMTSW:
-					filter = NULL;
-					continue;
-
-				case INPLSW:
-					inplace++;
-					continue;
-				case NINPLSW:
-					inplace = 0;
-					continue;
-
-				case MIMESW:
-					mime++;
-					filter = NULL;
-					continue;
-				case NMIMESW:
-					mime = 0;
-					continue;
-
-				case DGSTSW:
-					if (!(digest = *argp++) || *digest == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					mime = 0;
-					continue;
-				case ISSUESW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					if ((issue = atoi(cp)) < 1)
-						adios(NULL, "bad argument %s %s", argp[-2], cp);
-					continue;
-				case VOLUMSW:
-					if (!(cp = *argp++) || *cp == '-')
-						adios(NULL, "missing argument to %s", argp[-2]);
-					if ((volume = atoi(cp)) < 1)
-						adios(NULL, "bad argument %s %s", argp[-2], cp);
-					continue;
-
-				case BITSTUFFSW:
-					dashstuff = 1;  /* trinary logic */
-					continue;
-				case NBITSTUFFSW:
-					dashstuff = -1;  /* trinary logic */
-					continue;
+			case NWHATSW:
+				nwhat++;
+				continue;
+
+			case FILESW:
+				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 FILTSW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				filter = getcpy(etcpath(cp));
+				mime = 0;
+				continue;
+			case FORMSW:
+				if (!(form = *argp++) || *form == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				continue;
+
+			case FRMTSW:
+				filter = getcpy(etcpath(mhlforward));
+				continue;
+			case NFRMTSW:
+				filter = NULL;
+				continue;
+
+			case MIMESW:
+				mime++;
+				filter = NULL;
+				continue;
+			case NMIMESW:
+				mime = 0;
+				continue;
+
+			case DGSTSW:
+				if (!(digest = *argp++) || *digest == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				mime = 0;
+				continue;
+			case ISSUESW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				if ((issue = atoi(cp)) < 1)
+					adios(NULL, "bad argument %s %s",
+							argp[-2], cp);
+				continue;
+			case VOLUMSW:
+				if (!(cp = *argp++) || *cp == '-')
+					adios(NULL, "missing argument to %s",
+							argp[-2]);
+				if ((volume = atoi(cp)) < 1)
+					adios(NULL, "bad argument %s %s",
+							argp[-2], cp);
+				continue;
 			}
 		}
 		if (*cp == '+' || *cp == '@') {
@@ -246,9 +235,9 @@ main(int argc, char **argv)
 
 #ifdef MHE
 	strncpy(drft, buildsw ? toabsdir("draft")
-		: m_draft("new"), sizeof(drft));
+		: m_draft(seq_beyond), sizeof(drft));
 #else
-	strncpy(drft, m_draft("new"), sizeof(drft));
+	strncpy(drft, m_draft(seq_beyond), sizeof(drft));
 #endif /* MHE */
 
 	if (file) {
@@ -261,7 +250,7 @@ main(int argc, char **argv)
 		** Forwarding a message.
 		*/
 		if (!msgp)
-			msgs[msgp++] = "cur";
+			msgs[msgp++] = seq_cur;
 		if (!folder)
 			folder = getcurfol();
 		maildir = toabsdir(folder);
@@ -330,15 +319,16 @@ main(int argc, char **argv)
 		** If filter file is defined, then format the
 		** messages into the draft using mhlproc.
 		*/
-		if (filter)
-			mhl_draft(out, digest, volume, issue, drft, filter,
-					dashstuff);
-		else if (mime)
-			copy_mime_draft(out);
-		else
-			copy_draft(out, digest, drft, volume, issue,
-					dashstuff);
-		close(out);
+		if (filter) {
+			mhl_draft(out, digest, volume, issue, drft, filter);
+			close(out);
+		} else if (mime) {
+			close(out);
+			add_forw_hdr(drft);
+		} else {
+			copy_draft(out, digest, drft, volume, issue);
+			close(out);
+		}
 
 		if (digest) {
 			snprintf(buf, sizeof(buf), IFORMAT, digest);
@@ -358,7 +348,7 @@ main(int argc, char **argv)
 	if (nwhat)
 		done(0);
 	what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
-		anot ? "Forwarded" : NULL, inplace, cwd);
+		anot ? "Forwarded" : NULL, cwd);
 	done(1);
 	return 1;
 }
@@ -369,10 +359,9 @@ main(int argc, char **argv)
 ** draft calling the mhlproc, and reading its output
 ** from a pipe.
 */
-
 static void
 mhl_draft(int out, char *digest, int volume, int issue,
-	char *file, char *filter, int dashstuff)
+	char *file, char *filter)
 {
 	pid_t child_id;
 	int i, msgnum, pd[2];
@@ -388,79 +377,67 @@ mhl_draft(int out, char *digest, int volume, int issue,
 	for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
 		sleep(5);
 	switch (child_id) {
-		case NOTOK:
-			adios("fork", "unable to");
+	case NOTOK:
+		adios("fork", "unable to");
 
-		case OK:
-			close(pd[0]);
-			dup2(pd[1], 1);
-			close(pd[1]);
+	case OK:
+		close(pd[0]);
+		dup2(pd[1], 1);
+		close(pd[1]);
 
-			i = 1;
-			vec[i++] = "-forwall";
-			vec[i++] = "-form";
-			vec[i++] = filter;
+		i = 1;
+		vec[i++] = "-forwall";
+		vec[i++] = "-form";
+		vec[i++] = filter;
 
-			if (digest) {
-				vec[i++] = "-digest";
-				vec[i++] = digest;
-				vec[i++] = "-issue";
-				snprintf(buf1, sizeof(buf1), "%d", issue);
-				vec[i++] = buf1;
-				vec[i++] = "-volume";
-				snprintf(buf2, sizeof(buf2), "%d", volume);
-				vec[i++] = buf2;
-			}
-
-			/*
-			** Are we dashstuffing (quoting) the lines that begin
-			** with `-'.  We use the mhl default (don't add any
-			** flag) unless the user has specified a specific flag.
-			*/
-			if (dashstuff > 0)
-				vec[i++] = "-dashstuffing";
-			else if (dashstuff < 0)
-				vec[i++] = "-nodashstuffing";
+		if (digest) {
+			vec[i++] = "-digest";
+			vec[i++] = digest;
+			vec[i++] = "-issue";
+			snprintf(buf1, sizeof(buf1), "%d", issue);
+			vec[i++] = buf1;
+			vec[i++] = "-volume";
+			snprintf(buf2, sizeof(buf2), "%d", volume);
+			vec[i++] = buf2;
+		}
 
-			if (mp->numsel >= MAXARGS - i)
-				adios(NULL, "more than %d messages for %s exec", MAXARGS - i, vec[0]);
+		if (mp->numsel >= MAXARGS - i)
+			adios(NULL, "more than %d messages for %s exec",
+					MAXARGS - i, vec[0]);
 
-			/*
-			** Now add the message names to filter.  We can only
-			** handle about 995 messages (because vec is fixed
-			** size), but that should be plenty.
-			*/
-			for (msgnum = mp->lowsel;
-					msgnum <= mp->hghsel && i < sizeof(vec) - 1;
-					msgnum++)
-				if (is_selected(mp, msgnum))
-					vec[i++] = getcpy(m_name(msgnum));
-			vec[i] = NULL;
-
-			execvp(mhlproc, vec);
-			fprintf(stderr, "unable to exec ");
-			perror(mhlproc);
-			_exit(-1);
-
-		default:
-			close(pd[1]);
-			cpydata(pd[0], out, vec[0], file);
-			close(pd[0]);
-			pidXwait(child_id, mhlproc);
-			break;
+		/*
+		** Now add the message names to filter.  We can only
+		** handle about 995 messages (because vec is fixed
+		** size), but that should be plenty.
+		*/
+		for (msgnum = mp->lowsel;
+				msgnum <= mp->hghsel && i < sizeof(vec) - 1;
+				msgnum++)
+			if (is_selected(mp, msgnum))
+				vec[i++] = getcpy(m_name(msgnum));
+		vec[i] = NULL;
+
+		execvp(mhlproc, vec);
+		fprintf(stderr, "unable to exec ");
+		perror(mhlproc);
+		_exit(-1);
+
+	default:
+		close(pd[1]);
+		cpydata(pd[0], out, vec[0], file);
+		close(pd[0]);
+		pidXwait(child_id, mhlproc);
+		break;
 	}
 }
 
 
 /*
 ** Copy the messages into the draft.  The messages are
-** not filtered through the mhlproc.  Do dashstuffing if
-** necessary.
+** not filtered through the mhlproc.  Do dashstuffing.
 */
-
 static void
-copy_draft(int out, char *digest, char *file, int volume, int issue,
-		int dashstuff)
+copy_draft(int out, char *digest, char *file, int volume, int issue)
 {
 	int fd,i, msgcnt, msgnum;
 	int len, buflen;
@@ -504,12 +481,8 @@ copy_draft(int out, char *digest, char *file, int volume, int issue,
 
 			/*
 			** Copy the message.  Add RFC934 quoting (dashstuffing)
-			** unless given the -nodashstuffing flag.
 			*/
-			if (dashstuff >= 0)
-				cpydgst(fd, out, msgnam, file);
-			else
-				cpydata(fd, out, msgnam, file);
+			cpydgst(fd, out, msgnam, file);
 
 			close(fd);
 			msgcnt++;
@@ -540,25 +513,25 @@ copy_draft(int out, char *digest, char *file, int volume, int issue,
 
 
 /*
-** Create a mhbuild composition file for forwarding message.
+** Create an attachment header for the to be forward messages.
 */
-
 static void
-copy_mime_draft(int out)
+add_forw_hdr(char *draft)
 {
 	int msgnum;
 	char buffer[BUFSIZ];
 
-	snprintf(buffer, sizeof(buffer), "#forw [forwarded message%s] +%s",
-			mp->numsel == 1 ? "" : "s", mp->foldpath);
-	write(out, buffer, strlen(buffer));
-	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
-		if (is_selected(mp, msgnum)) {
-			snprintf(buffer, sizeof(buffer), " %s",
-					m_name(msgnum));
-			write(out, buffer, strlen(buffer));
+	snprintf(buffer, sizeof(buffer), "+%s", mp->foldpath);
+	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
+		if (!is_selected(mp, msgnum)) {
+			continue;
 		}
-	write(out, "\n", 1);
+		/* TODO: improve the code */
+		strncat(buffer, " ", sizeof(buffer)-strlen(buffer)-1);
+		strncat(buffer, m_name(msgnum),
+				sizeof(buffer)-strlen(buffer)-1);
+	}
+	annotate(draft, attach_hdr, buffer, 0, -2, 1);
 }