Renamed -version switch to -Version to remove the conflict with -verbose.

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 4523365..f8af5ca 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -46,15 +46,13 @@ static struct swit switches[] = {
 #define WHATSW  14
        { "whatnowproc program", 0 },
 #define VERSIONSW  15
-       { "version", 0 },
+       { "Version", 0 },
 #define HELPSW  16
        { "help", 0 },
 #define FILESW  17
        { "file file", 4 },  /* interface from msh */
-#ifdef MHE
 # define BILDSW  18
        { "build", 5 },  /* interface from mhe */
-#endif
        { NULL, 0 }
 };
 
@@ -141,10 +139,7 @@ main(int argc, char **argv)
        char **argp, **arguments;
        struct msgs *mp = NULL;
        FILE *in;
-
-#ifdef MHE
        int buildsw = 0;
-#endif /* MHE */
 
        filter = getcpy(etcpath(mhlreply));
 
@@ -215,11 +210,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 FILESW:
                                if (file)
@@ -286,12 +280,14 @@ main(int argc, char **argv)
        if (file && (msg || folder))
                adios(NULL, "can't mix files and folders/msgs");
 
-#ifdef MHE
-       strncpy(drft, buildsw ? toabsdir("reply")
-               : m_draft(seq_beyond), sizeof(drft));
-#else
-       strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+       strncpy(drft, buildsw ? toabsdir("reply") : 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
+       */
 
        if (file) {
                /*