X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..b4f2851d4:/uip/rcvdist.c?ds=sidebyside

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index c11ac491..6cc8e277 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -14,15 +14,18 @@
 #include <h/mts.h>
 #include <h/utils.h>
 
-static struct swit switches[] = {
-#define	FORMSW       0
-    { "form formfile",  4 },
-#define VERSIONSW    1
-    { "version", 0 },
-#define	HELPSW       2
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define RCVDIST_SWITCHES \
+    X("form formfile", 4, FORMSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(RCVDIST);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(RCVDIST, switches);
+#undef X
 
 static char backup[BUFSIZ] = "";
 static char drft[BUFSIZ] = "";
@@ -39,9 +42,9 @@ int
 main (int argc, char **argv)
 {
     pid_t child_id;
-    int i, vecp = 1;
-    char *addrs = NULL, *cp, *form = NULL, buf[BUFSIZ];
-    char **argp, **arguments, *vec[MAXARGS];
+    int i, vecp;
+    char *addrs = NULL, *cp, *form = NULL, buf[BUFSIZ], *program;
+    char **argp, **arguments, **vec;
     FILE *fp;
     char *tfile = NULL;
 
@@ -55,6 +58,13 @@ main (int argc, char **argv)
     /* read user profile/context */
     context_read();
 
+    /*
+     * Configure this now, since any unknown switches to rcvdist get
+     * sent to postproc
+     */
+
+    vec = argsplit(postproc, &program, &vecp);
+
     mts_init (invo_name);
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -111,7 +121,6 @@ main (int argc, char **argv)
     if (distout (drft, tmpfil, backup) == NOTOK)
 	done (1);
 
-    vec[0] = r1bindex (postproc, '/');
     vec[vecp++] = "-dist";
     vec[vecp++] = drft;
     if ((cp = context_find ("mhlproc"))) {
@@ -126,7 +135,7 @@ main (int argc, char **argv)
 	case NOTOK: 
 	    admonish (NULL, "unable to fork");/* fall */
 	case OK: 
-	    execvp (postproc, vec);
+	    execvp (program, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (postproc);
 	    _exit (1);
@@ -173,7 +182,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
     char *cp, *scanl, name[NAMESZ], tmpbuf[SBUFSIZ];
     register struct comp *cptr;
     FILE *out;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if (!(out = fopen (drft, "w")))
 	adios (drft, "unable to create");
@@ -193,10 +202,9 @@ rcvdistout (FILE *inb, char *form, char *addrs)
     if (cptr)
 	cptr->c_text = addrs;
 
-    m_getfld_state_init (&gstate);
     for (;;) {
 	int msg_count = SBUFSIZ;
-	switch (state = m_getfld (gstate, name, tmpbuf, &msg_count, inb)) {
+	switch (state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb)) {
 	    case FLD: 
 	    case FLDPLUS: 
 	    	i = fmt_addcomptext(name, tmpbuf);
@@ -204,7 +212,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 		    char_read += msg_count;
 		    while (state == FLDPLUS) {
 			msg_count = SBUFSIZ;
-			state = m_getfld (gstate, name, tmpbuf, &msg_count, inb);
+			state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 			fmt_appendcomp(i, name, tmpbuf);
 			char_read += msg_count;
 		    }
@@ -212,7 +220,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 
 		while (state == FLDPLUS) {
 		    msg_count = SBUFSIZ;
-		    state = m_getfld (gstate, name, tmpbuf, &msg_count, inb);
+		    state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
 		}
 		break;
 
@@ -233,7 +241,7 @@ finished: ;
     scanl = mh_xmalloc ((size_t) i + 2);
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
-    fmt_scan (fmt, scanl, i + 1, i, dat);
+    fmt_scan (fmt, scanl, i + 1, i, dat, NULL);
     fputs (scanl, out);
 
     if (ferror (out))