X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fforw.c;h=b1148b0946ab31999c0d8a503e3b1c182dd4e3b8;hp=fe056f4a67152a6fb981d5f664e823cae6c2dc00;hb=32b2354dbaf4bf934936eb5b102a4a3d2fdd209a;hpb=75fca31a5b9d5c1a99c74ab14c94438d8852fba9

diff --git a/uip/forw.c b/uip/forw.c
index fe056f4..b1148b0 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -34,15 +34,11 @@ static struct swit switches[] = {
 #define WHATSW  7
 	{ "whatnowproc program", 0 },
 #define VERSIONSW  8
-	{ "version", 0 },
+	{ "Version", 0 },
 #define HELPSW  9
 	{ "help", 0 },
-
-#ifdef MHE
 #define BILDSW  12
 	{ "build", 5 },  /* interface from mhe */
-#endif /* MHE */
-
 	{ NULL, 0 }
 };
 
@@ -70,10 +66,7 @@ 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, "");
@@ -122,11 +115,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 == '-')
@@ -169,13 +161,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.