X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/de4636bb664106d9932ae7acb517e471b848f1f3..8a97d4892770a49955add690ac2a53bdc6bf2fcf:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index f6f7924c..7bed6f8a 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -286,6 +286,7 @@ main (int argc, char **argv)
     char *cp, *msg = NULL, **argp, **arguments, *envelope;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *in, *out;
+    m_getfld_state_t gstate = 0;
 
 #ifdef LOCALE
     setlocale(LC_ALL, "");
@@ -522,7 +523,7 @@ main (int argc, char **argv)
     start_headers ();
     if (debug) {
 	verbose++;
-	discard (out = stdout);	/* XXX: reference discard() to help loader */
+	out = stdout;
     } else {
 	if (whomsw) {
 	    if ((out = fopen ("/dev/null", "w")) == NULL)
@@ -542,32 +543,30 @@ main (int argc, char **argv)
 
     hdrtab = msgstate == NORMAL ? NHeaders : RHeaders;
 
-    for (compnum = 1, state = FLD;;) {
-	switch (state = m_getfld (state, name, buf, sizeof(buf), in)) {
+    for (compnum = 1;;) {
+	int bufsz = sizeof buf;
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) {
 	    case FLD: 
-	    case FLDEOF: 
 	    case FLDPLUS: 
 		compnum++;
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
-		    state = m_getfld (state, name, buf, sizeof(buf), in);
+		    bufsz = sizeof buf;
+		    state = m_getfld (&gstate, name, buf, &bufsz, in);
 		    cp = add (buf, cp);
 		}
 		putfmt (name, cp, out);
 		free (cp);
-		if (state != FLDEOF)
-		    continue;
-		finish_headers (out);
-		break;
+		continue;
 
 	    case BODY: 
-	    case BODYEOF: 
 		finish_headers (out);
 		if (whomsw)
 		    break;
 		fprintf (out, "\n%s", buf);
 		while (state == BODY) {
-		    state = m_getfld (state, name, buf, sizeof(buf), in);
+		    bufsz = sizeof buf;
+		    state = m_getfld (&gstate, name, buf, &bufsz, in);
 		    fputs (buf, out);
 		}
 		break;
@@ -585,6 +584,7 @@ main (int argc, char **argv)
 	}
 	break;
     }
+    m_getfld_state_destroy (&gstate);
 
     if (pfd != NOTOK)
 	anno ();
@@ -1787,8 +1787,9 @@ static void
 fcc (char *file, char *folder)
 {
     pid_t child_id;
-    int i, status;
+    int i, status, argp;
     char fold[BUFSIZ];
+    char **arglist, *program;
 
     if (verbose)
 	printf ("  %sFcc %s: ", msgstate == RESENT ? "Resent-" : "", folder);
@@ -1811,8 +1812,14 @@ fcc (char *file, char *folder)
 		    *folder == '+' || *folder == '@' ? "" : "+", folder);
 
 	    /* now exec the fileproc */
-	    execlp (fileproc, r1bindex (fileproc, '/'),
-		    "-link", "-file", file, fold, NULL);
+
+	    arglist = argsplit(fileproc, &program, &argp);
+	    arglist[argp++] = "-link";
+	    arglist[argp++] = "-file";
+	    arglist[argp++] = file;
+	    arglist[argp++] = fold;
+	    arglist[argp] = NULL;
+	    execvp (program, arglist);
 	    _exit (-1);
 
 	default: