Move #include from h/mh.h to source files

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index b1148b0..91ce04a 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -11,7 +11,8 @@
 #include <h/fmt_scan.h>
 #include <h/tws.h>
 #include <h/utils.h>
-
+#include <unistd.h>
+#include <locale.h>
 
 #define IFORMAT  "digest-issue-%s"
 #define VFORMAT  "digest-volume-%s"
@@ -20,7 +21,7 @@ static struct swit switches[] = {
 #define ANNOSW  0
        { "annotate", 0 },
 #define NANNOSW  1
-       { "noannotate", 0 },
+       { "noannotate", 2 },
 #define EDITRSW  2
        { "editor editor", 0 },
 #define FORMSW  3
@@ -37,7 +38,7 @@ static struct swit switches[] = {
        { "Version", 0 },
 #define HELPSW  9
        { "help", 0 },
-#define BILDSW  12
+#define BILDSW  10
        { "build", 5 },  /* interface from mhe */
        { NULL, 0 }
 };
@@ -68,9 +69,7 @@ main(int argc, char **argv)
        char *fmtstr;
        int buildsw = 0;
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -84,17 +83,18 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               /* sysexits.h EX_USAGE */
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case ANNOSW:
                                anot++;
@@ -191,9 +191,12 @@ main(int argc, char **argv)
                adios(NULL, "no messages in %s", folder);
 
        /* parse all the message ranges/sequences and set SELECTED */
-       for (msgnum = 0; msgnum < msgp; msgnum++)
-               if (!m_convert(mp, msgs[msgnum]))
-                       done(1);
+       for (msgnum = 0; msgnum < msgp; msgnum++) {
+               if (!m_convert(mp, msgs[msgnum])) {
+                       /* sysexits.h EX_USAGE */
+                       exit(1);
+               }
+       }
        seq_setprev(mp);  /* set the previous sequence */
 
        if ((out = creat(drft, m_gmprot())) == NOTOK)
@@ -244,10 +247,10 @@ main(int argc, char **argv)
        context_save();  /* save the context file */
 
        if (buildsw)
-               done(0);
+               exit(0);
        what_now(ed, NOUSE, drft, NULL, 0, mp,
                anot ? "Forwarded" : NULL, cwd);
-       done(1);
+       /* sysexits.h EX_SOFTWARE */
        return 1;
 }
 
@@ -259,25 +262,33 @@ static void
 add_forw_hdr(char *draft)
 {
        int msgnum;
-       char buffer[BUFSIZ];
-
-       snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
-                       "-comp '%s' -text '+%s",
-                       draft, attach_hdr, mp->foldpath);
+       char buf[BUFSIZ];
+       char *vec[MAXARGS];
+       int vecp = 0;
+
+       vec[vecp++] = "anno";
+       vec[vecp++] = "-append";
+       vec[vecp++] = "-nodate";
+       vec[vecp++] = draft;
+       vec[vecp++] = "-comp";
+       vec[vecp++] = attach_hdr;
+       vec[vecp++] = "-text";
+       snprintf(buf, sizeof buf, "+%s", mp->foldpath);
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (!is_selected(mp, msgnum)) {
                        continue;
                }
-               /* TODO: Check for buffer length! */
-               strcat(buffer, " ");
-               strcat(buffer, m_name(msgnum));
-       }
-       strcat(buffer, "'");
-       /* TODO: This check is bad, but better than nothing */
-       if (strlen(buffer) > BUFSIZ) {
-               adios(NULL, "Too long attachment header line. Forward less messages.");
+               if (strlen(buf) + 1 + strlen(m_name(msgnum)) + 1
+                               > sizeof buf) {
+                       adios(NULL, "Attachment header line too long. "
+                                       "Forward less messages.");
+               }
+               strcat(buf, " ");
+               strcat(buf, m_name(msgnum));
        }
-       if (system(buffer) != 0) {
+       vec[vecp++] = buf;
+       vec[vecp] = NULL;
+       if (execprog(*vec, vec) != 0) {
                advise(NULL, "unable to add attachment header");
        }
 }