Changed types and added casts so that build is clean with gcc -Wsign-compare.

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index b84632b..53b0968 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -73,6 +73,7 @@ main(int argc, char **argv)
        char *folder = NULL;
        char *form = NULL, buf[BUFSIZ], value[10];
        char **argp, **arguments, *msgs[MAXARGS];
+       char *fmtstr;
 
 #ifdef MHE
        int buildsw = 0;
@@ -213,6 +214,9 @@ main(int argc, char **argv)
                        done(1);
        seq_setprev(mp);  /* set the previous sequence */
 
+       if ((out = creat(drft, m_gmprot())) == NOTOK)
+               adios(drft, "unable to create");
+
        /* Open form (component) file. */
        if (digest) {
                if (issue == 0) {
@@ -230,18 +234,16 @@ main(int argc, char **argv)
                if (!form)
                        form = digestcomps;
                in = build_form(form, digest, volume, issue);
-       } else
-               in = open_form(&form, forwcomps);
-
-       if ((out = creat(drft, m_gmprot())) == NOTOK)
-               adios(drft, "unable to create");
-
-       /*
-       ** copy the components into the draft
-       */
-       cpydata(in, out, form, drft);
-       close(in);
+               cpydata(in, out, form, drft);
+               close(in);
+       } else {
+               fmtstr = new_fs(form, forwcomps);
+               if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
+                       adios(drft, "error writing");
+               }
+       }
        close(out);
+
        add_forw_hdr(drft);
 
        if (digest) {
@@ -276,17 +278,25 @@ add_forw_hdr(char *draft)
        int msgnum;
        char buffer[BUFSIZ];
 
-       snprintf(buffer, sizeof(buffer), "+%s", mp->foldpath);
+       snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
+                       "-comp '%s' -text '+%s",
+                       draft, attach_hdr, mp->foldpath);
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
                if (!is_selected(mp, msgnum)) {
                        continue;
                }
-               /* TODO: improve the code */
-               strncat(buffer, " ", sizeof(buffer)-strlen(buffer)-1);
-               strncat(buffer, m_name(msgnum),
-                               sizeof(buffer)-strlen(buffer)-1);
+               /* 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 (system(buffer) != 0) {
+               advise(NULL, "unable to add attachment header");
        }
-       annotate(draft, attach_hdr, buffer, 0, -2, 1);
 }
 
 
@@ -295,7 +305,7 @@ build_form(char *form, char *digest, int volume, int issue)
 {
        int in;
        int fmtsize;
-       register char *nfs;
+       register char *fmtstr;
        char *line, tmpfil[BUFSIZ];
        FILE *tmp;
        register struct comp *cptr;
@@ -304,11 +314,11 @@ build_form(char *form, char *digest, int volume, int issue)
        char *cp = NULL;
 
        /* Get new format string */
-       nfs = new_fs(form, NULL, NULL);
-       fmtsize = strlen(nfs) + 256;
+       fmtstr = new_fs(form, NULL);
+       fmtsize = strlen(fmtstr) + 256;
 
        /* Compile format string */
-       fmt_compile(nfs, &fmt);
+       fmt_compile(fmtstr, &fmt);
 
        FINDCOMP(cptr, "digest");
        if (cptr)