X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fforw.c;h=54b7c074e26aae0ab131129a4c05d48a8ff9d93c;hb=2dfc2b7e8d543372cd1a66a3d7dc02f7f5e40b7d;hp=4fbd45f38966fa4be055bfa9879ad01b2e01170c;hpb=ee4f43cf2ef0084ec698e4e87159a94c01940622;p=mmh

diff --git a/uip/forw.c b/uip/forw.c
index 4fbd45f..54b7c07 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -20,31 +20,25 @@ static struct swit switches[] = {
 #define ANNOSW  0
 	{ "annotate", 0 },
 #define NANNOSW  1
-	{ "noannotate", 0 },
+	{ "noannotate", 2 },
 #define EDITRSW  2
 	{ "editor editor", 0 },
-#define NEDITSW  3
-	{ "noedit", 0 },
-#define FORMSW  4
+#define FORMSW  3
 	{ "form formfile", 0 },
-#define DGSTSW  5
+#define DGSTSW  4
 	{ "digest list", 0 },
-#define ISSUESW  6
+#define ISSUESW  5
 	{ "issue number", 0 },
-#define VOLUMSW  7
+#define VOLUMSW  6
 	{ "volume number", 0 },
-#define WHATSW  8
+#define WHATSW  7
 	{ "whatnowproc program", 0 },
-#define VERSIONSW  9
-	{ "version", 0 },
-#define HELPSW  10
+#define VERSIONSW  8
+	{ "Version", 0 },
+#define HELPSW  9
 	{ "help", 0 },
-
-#ifdef MHE
-#define BILDSW  12
+#define BILDSW  10
 	{ "build", 5 },  /* interface from mhe */
-#endif /* MHE */
-
 	{ NULL, 0 }
 };
 
@@ -64,7 +58,7 @@ main(int argc, char **argv)
 {
 	int msgp = 0, anot = 0;
 	int issue = 0, volume = 0;
-	int nedit = 0, in;
+	int in;
 	int out, msgnum;
 	char *cp, *cwd, *maildir;
 	char *digest = NULL, *ed = NULL;
@@ -72,14 +66,9 @@ main(int argc, char **argv)
 	char *form = NULL, buf[BUFSIZ], value[10];
 	char **argp, **arguments, *msgs[MAXARGS];
 	char *fmtstr;
-
-#ifdef MHE
 	int buildsw = 0;
-#endif /* MHE */
 
-#ifdef LOCALE
 	setlocale(LC_ALL, "");
-#endif
 	invo_name = mhbasename(argv[0]);
 
 	/* read user profile/context */
@@ -116,10 +105,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 WHATSW:
@@ -128,11 +113,10 @@ main(int argc, char **argv)
 					adios(NULL, "missing argument to %s",
 							argp[-2]);
 				continue;
-#ifdef MHE
+
 			case BILDSW:
-				buildsw++;  /* fall... */
+				buildsw++;
 				continue;
-#endif /* MHE */
 
 			case FORMSW:
 				if (!(form = *argp++) || *form == '-')
@@ -175,13 +159,14 @@ main(int argc, char **argv)
 	}
 
 	cwd = getcpy(pwd());
-
-#ifdef MHE
-	strncpy(drft, buildsw ? toabsdir("draft")
-		: m_draft(seq_beyond), sizeof(drft));
-#else
-	strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+	strncpy(drft, buildsw ? toabsdir("draft") : m_draft(seq_beyond),
+			sizeof(drft));
+	/*
+	** FIXME: (concerning MHE support (buildsw) only)
+	** There's no check if the draft already exists. mmh has removed
+	** this case by having the draft folder. I won't add code only to
+	** handle this legacy issue for MHE. -- meillo@marmaro.de 2012-05
+	*/
 
 	/*
 	** Forwarding a message.
@@ -258,7 +243,7 @@ main(int argc, char **argv)
 
 	if (buildsw)
 		done(0);
-	what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
+	what_now(ed, NOUSE, drft, NULL, 0, mp,
 		anot ? "Forwarded" : NULL, cwd);
 	done(1);
 	return 1;