Bring in all of the mh-e support that is actually used

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index fe056f4..adf0faa 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -37,12 +37,8 @@ static struct swit switches[] = {
        { "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.