Folded fileproc to constant `refile'.

[mmh] / uip / spost.c

diff --git a/uip/spost.c b/uip/spost.c
index 43d3d10..369f03e 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -87,6 +87,7 @@ static struct headers NHeaders[] = {
        { "Bcc", HADR|HTRY|HBCC, MINV },
        { "Message-Id", HBAD, 0 },
        { "Fcc", HFCC, 0 },
+       { "Envelope-From", HIGN, 0 },
        { NULL, 0, 0 }
 };
 
@@ -103,6 +104,7 @@ static struct headers RHeaders[] = {
        { "Resent-Fcc", HFCC, 0 },
        { "Reply-To", HADR, 0 },
        { "Fcc", HIGN, 0 },
+       { "Envelope-From", HIGN, 0 },
        { NULL, 0, 0 }
 };
 
@@ -477,7 +479,7 @@ finish_headers(FILE *out)
        char *resentstr = (msgstate == resent) ? "Resent-" : "";
 
        if (!(msgflags & MDAT)) {
-               fprintf(out, "%sDate: %s\n", resentstr, dtimenow(0));
+               fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
        }
 
        strncpy(from, getusername(), sizeof(from));
@@ -652,12 +654,12 @@ fcc(char *file, char *folders)
                                folders);
                fflush(stdout);
        }
-       if (strlen(fileproc)+strlen(file)+strlen(folders)+100 > sizeof cmd) {
+       if (100+strlen(file)+strlen(folders) > sizeof cmd) {
                adios(NULL, "Too much Fcc data");
        }
        /* hack: read from /dev/null and refile(1) won't question us */
-       snprintf(cmd, sizeof cmd, "</dev/null %s -link -file %s %s",
-                       fileproc, file, folders);
+       snprintf(cmd, sizeof cmd, "</dev/null refile -link -file '%s' %s",
+                       file, folders);
        status = system(cmd);
        if (status == -1) {
                fprintf(stderr, "Skipped %sFcc %s: unable to system().\n",