We have only numeric timezone support (e.g. +0200) from now on.

[mmh] / uip / forw.c

diff --git a/uip/forw.c b/uip/forw.c
index 031c191..be1242b 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -238,7 +238,7 @@ main(int argc, char **argv)
                close(in);
        } else {
                fmtstr = new_fs(form, forwcomps);
-               if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
+               if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
                        adios(drft, "error writing");
                }
        }
@@ -278,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);
 }
 
 
@@ -317,7 +325,7 @@ build_form(char *form, char *digest, int volume, int issue)
                cptr->c_text = digest;
        FINDCOMP(cptr, "date");
        if (cptr)
-               cptr->c_text = getcpy(dtimenow(0));
+               cptr->c_text = getcpy(dtimenow());
 
        dat[0] = issue;
        dat[1] = volume;