Use result, because (void) didn't prevent warning on FreeBSD 10.

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index c11ac491658aced59243b391d74b88abafeaf6e6..a8231e911167c424b6aa4b07f490b45addd5372e 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -14,15 +14,18 @@
 #include <h/mts.h>
 #include <h/utils.h>
 
 #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] = "";
 
 static char backup[BUFSIZ] = "";
 static char drft[BUFSIZ] = "";


@@ -39,23 +42,24 @@ int
 main (int argc, char **argv)
 {
     pid_t child_id;
 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;
 
     FILE *fp;
     char *tfile = NULL;
 

+    if (nmh_init(argv[0], 2)) { return 1; }
+

     done=unlink_done;
 
     done=unlink_done;
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    /*
+     * Configure this now, since any unknown switches to rcvdist get
+     * sent to postproc
+     */

 
 

-    /* read user profile/context */
-    context_read();
+    vec = argsplit(postproc, &program, &vecp);

 
 

-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 


@@ -85,7 +89,7 @@ main (int argc, char **argv)
                    continue;
            }
        }
                    continue;
            }
        }

-       addrs = addrs ? add (cp, add (", ", addrs)) : getcpy (cp);
+       addrs = addrs ? add (cp, add (", ", addrs)) : mh_xstrdup(cp);

     }
 
     if (addrs == NULL)
     }
 
     if (addrs == NULL)


@@ -94,15 +98,17 @@ main (int argc, char **argv)
 
     umask (~m_gmprot ());
 
 
     umask (~m_gmprot ());
 

-    tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
-    if (tfile == NULL) adios("rcvdist", "unable to create temporary file");
+    if ((tfile = m_mktemp2(NULL, invo_name, NULL, &fp)) == NULL) {
+       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }

     strncpy (tmpfil, tfile, sizeof(tmpfil));
 
     cpydata (fileno (stdin), fileno (fp), "message", tmpfil);
     fseek (fp, 0L, SEEK_SET);
 
     strncpy (tmpfil, tfile, sizeof(tmpfil));
 
     cpydata (fileno (stdin), fileno (fp), "message", tmpfil);
     fseek (fp, 0L, SEEK_SET);
 

-    tfile = m_mktemp2(NULL, invo_name, NULL, NULL);
-    if (tfile == NULL) adios("forw", "unable to create temporary file");
+    if ((tfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+       adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }

     strncpy (drft, tfile, sizeof(tmpfil));
 
     rcvdistout (fp, form, addrs);
     strncpy (drft, tfile, sizeof(tmpfil));
 
     rcvdistout (fp, form, addrs);


@@ -111,13 +117,12 @@ main (int argc, char **argv)
     if (distout (drft, tmpfil, backup) == NOTOK)
        done (1);
 
     if (distout (drft, tmpfil, backup) == NOTOK)
        done (1);
 

-    vec[0] = r1bindex (postproc, '/');

     vec[vecp++] = "-dist";
     vec[vecp++] = "-dist";

-    vec[vecp++] = drft;

     if ((cp = context_find ("mhlproc"))) {
       vec[vecp++] = "-mhlproc";
       vec[vecp++] = cp;
     }
     if ((cp = context_find ("mhlproc"))) {
       vec[vecp++] = "-mhlproc";
       vec[vecp++] = cp;
     }

+    vec[vecp++] = drft;

     vec[vecp] = NULL;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
     vec[vecp] = NULL;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)


@@ -126,7 +131,7 @@ main (int argc, char **argv)
        case NOTOK: 
            admonish (NULL, "unable to fork");/* fall */
        case OK: 
        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);
            fprintf (stderr, "unable to exec ");
            perror (postproc);
            _exit (1);


@@ -168,12 +173,13 @@ static char *addrcomps[] = {
 static void
 rcvdistout (FILE *inb, char *form, char *addrs)
 {
 static void
 rcvdistout (FILE *inb, char *form, char *addrs)
 {

-    register int char_read = 0, format_len, i, state;
-    register char **ap;
-    char *cp, *scanl, name[NAMESZ], tmpbuf[SBUFSIZ];
-    register struct comp *cptr;
+    int char_read = 0, format_len, i, state;
+    char **ap;
+    char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
+    charstring_t scanl;
+    struct comp *cptr;

     FILE *out;
     FILE *out;

-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;

 
     if (!(out = fopen (drft, "w")))
        adios (drft, "unable to create");
 
     if (!(out = fopen (drft, "w")))
        adios (drft, "unable to create");


@@ -193,10 +199,9 @@ rcvdistout (FILE *inb, char *form, char *addrs)
     if (cptr)
        cptr->c_text = addrs;
 
     if (cptr)
        cptr->c_text = addrs;
 

-    m_getfld_state_init (&gstate);

     for (;;) {
        int msg_count = SBUFSIZ;
     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);
            case FLD: 
            case FLDPLUS: 
                i = fmt_addcomptext(name, tmpbuf);


@@ -204,7 +209,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
                    char_read += msg_count;
                    while (state == FLDPLUS) {
                        msg_count = SBUFSIZ;
                    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;
                    }
                        fmt_appendcomp(i, name, tmpbuf);
                        char_read += msg_count;
                    }


@@ -212,7 +217,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 
                while (state == FLDPLUS) {
                    msg_count = SBUFSIZ;
 
                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;
 
                }
                break;
 


@@ -230,17 +235,17 @@ finished: ;
     m_getfld_state_destroy (&gstate);
 
     i = format_len + char_read + 256;
     m_getfld_state_destroy (&gstate);
 
     i = format_len + char_read + 256;

-    scanl = mh_xmalloc ((size_t) i + 2);
+    scanl = charstring_create (i + 2);

     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;

-    fmt_scan (fmt, scanl, i + 1, i, dat);
-    fputs (scanl, out);
+    fmt_scan (fmt, scanl, i, dat, NULL);
+    fputs (charstring_buffer (scanl), out);

 
     if (ferror (out))
        adios (drft, "error writing");
     fclose (out);
 
 
     if (ferror (out))
        adios (drft, "error writing");
     fclose (out);
 

-    free (scanl);
+    charstring_free (scanl);

     fmt_free(fmt, 1);
 }
 
     fmt_free(fmt, 1);
 }
 


@@ -249,11 +254,11 @@ static void
 unlink_done (int status)
 {
     if (backup[0])
 unlink_done (int status)
 {
     if (backup[0])

-       unlink (backup);
+       (void) m_unlink (backup);

     if (drft[0])
     if (drft[0])

-       unlink (drft);
+       (void) m_unlink (drft);

     if (tmpfil[0])
     if (tmpfil[0])

-       unlink (tmpfil);
+       (void) m_unlink (tmpfil);

 
     exit (status ? RCV_MBX : RCV_MOK);
 }
 
     exit (status ? RCV_MBX : RCV_MOK);
 }