Use execprog() instead of system() ... partly transition

[mmh] / uip / repl.c

diff --git a/uip/repl.c b/uip/repl.c
index 4523365..e5fbc0f 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -18,43 +18,41 @@ static struct swit switches[] = {
 #define GROUPSW  0
        { "group", 0 },
 #define NGROUPSW  1
-       { "nogroup", 0 },
+       { "nogroup", 2 },
 #define ANNOSW  2
        { "annotate", 0 },
 #define NANNOSW  3
-       { "noannotate", 0 },
+       { "noannotate", 2 },
 #define CCSW  4
        { "cc all|to|cc|me", 0 },
 #define NCCSW  5
-       { "nocc type", 0 },
+       { "nocc type", 2 },
 #define EDITRSW  6
        { "editor editor", 0 },
 #define FILTSW  7
        { "filter filterfile", 0 },
 #define NFILTSW  8
-       { "nofilter", 0 },
+       { "nofilter", 2 },
 #define FORMSW  9
        { "form formfile", 0 },
 #define MIMESW  10
        { "mime", 0 },
 #define NMIMESW  11
-       { "nomime", 0 },
+       { "nomime", 2 },
 #define QURYSW  12
        { "query", 0 },
 #define NQURYSW  13
-       { "noquery", 0 },
+       { "noquery", 2 },
 #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
+#define BILDSW  18
        { "build", 5 },  /* interface from mhe */
-#endif
        { NULL, 0 }
 };
 
@@ -141,16 +139,11 @@ 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));
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -215,11 +208,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 +278,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) {
                /*
@@ -579,11 +573,11 @@ finished:
                /* add an attachment header */
                char buffer[BUFSIZ];
 
-               snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
-                               "-comp '%s' -text '+%s %s'",
-                               drft,
-                               attach_hdr, mp->foldpath, m_name(mp->lowsel));
-               if (system(buffer) != 0) {
+               snprintf(buffer, sizeof buffer, "+%s %s",
+                               mp->foldpath, m_name(mp->lowsel));
+               if (execprogl("anno", "anno", "-append", "-nodate",
+                               drft, "-comp", attach_hdr, "-text", buffer,
+                               (char *)NULL) != 0) {
                        advise(NULL, "unable to add attachment header");
                }
        }