oauth.c: Alter permissions from 0755 to 0644.

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index edbf65fffc19deacbe5394f6a2d5dda9cc8712d2..c8a1d9573e0ea0bfb157ad4dca97bad7eb08d723 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -1,28 +1,43 @@
-
-/*
- * rcvdist.c -- asynchronously redistribute messages
+/* rcvdist.c -- asynchronously redistribute messages

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/fmt_scan.h>
-#include <h/rcvmail.h>
-#include <h/tws.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 }
-};
+#include "h/mh.h"
+#include "distsbr.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/m_getfld.h"
+#include "sbr/getarguments.h"
+#include "sbr/smatch.h"
+#include "sbr/cpydata.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/pidstatus.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/fmt_scan.h"
+#include "h/tws.h"
+#include "h/mts.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_mktemp.h"
+
+#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 +54,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 vecp;
+    char *addrs = NULL, *cp, *form = NULL, buf[BUFSIZ], *program;
+    char **argp, **arguments, **vec;

     FILE *fp;
     char *tfile = NULL;
 
     FILE *fp;
     char *tfile = NULL;
 

-    done=unlink_done;
+    if (nmh_init(argv[0], true, false)) { return 1; }
+
+    set_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;
 


@@ -74,35 +90,37 @@ main (int argc, char **argv)
                        "%s [switches] [switches for postproc] address ...",
                        invo_name);
                    print_help (buf, switches, 1);
                        "%s [switches] [switches for postproc] address ...",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    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)

-       adios (NULL, "usage: %s [switches] [switches for postproc] address ...",
+       die("usage: %s [switches] [switches for postproc] address ...",

            invo_name);
 
     umask (~m_gmprot ());
 
            invo_name);
 
     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) {
+       die("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) {
+       die("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,22 +129,21 @@ 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;
 
     vec[vecp] = NULL;
 

-    for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-       sleep (5);
+    child_id = fork();

     switch (child_id) {
        case NOTOK: 
     switch (child_id) {
        case NOTOK: 

-           admonish (NULL, "unable to fork");/* fall */
+            adios("fork", "failed:");
+

        case OK: 
        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);


@@ -140,16 +157,10 @@ main (int argc, char **argv)
 
 /* very similar to routine in replsbr.c */
 
 
 /* very similar to routine in replsbr.c */
 

-#define        SBUFSIZ 256
-

 static int outputlinelen = OUTPUTLINELEN;
 
 static struct format *fmt;
 
 static int outputlinelen = OUTPUTLINELEN;
 
 static struct format *fmt;
 

-static int ncomps = 0;
-static char **compbuffers = 0;
-static struct comp **used_buf = 0;
-

 static int dat[5];
 
 static char *addrcomps[] = {
 static int dat[5];
 
 static char *addrcomps[] = {


@@ -172,11 +183,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 *tmpbuf, **nxtbuf, **ap;
-    char *cp, *scanl, name[NAMESZ];
-    register struct comp *cptr, **savecomp;
+    int char_read = 0, format_len, i, state;
+    char **ap;
+    char *cp, name[NAMESZ], tmpbuf[NMH_BUFSIZ];
+    charstring_t scanl;
+    struct comp *cptr;

     FILE *out;
     FILE *out;

+    m_getfld_state_t gstate;

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


@@ -184,66 +197,39 @@ rcvdistout (FILE *inb, char *form, char *addrs)
     /* get new format string */
     cp = new_fs (form ? form : rcvdistcomps, NULL, NULL);
     format_len = strlen (cp);
     /* get new format string */
     cp = new_fs (form ? form : rcvdistcomps, NULL, NULL);
     format_len = strlen (cp);

-    ncomps = fmt_compile (cp, &fmt) + 1;
-    if (!(nxtbuf = compbuffers = (char **) calloc ((size_t) ncomps, sizeof(char *))))
-       adios (NULL, "unable to allocate component buffers");
-    if (!(savecomp = used_buf = (struct comp **) calloc ((size_t) (ncomps + 1), sizeof(struct comp *))))
-       adios (NULL, "unable to allocate component buffer stack");
-    savecomp += ncomps + 1;
-    *--savecomp = 0;
-
-    for (i = ncomps; i--;)
-       *nxtbuf++ = mh_xmalloc (SBUFSIZ);
-    nxtbuf = compbuffers;
-    tmpbuf = *nxtbuf++;
+    fmt_compile (cp, &fmt, 1);

 
     for (ap = addrcomps; *ap; ap++) {
 
     for (ap = addrcomps; *ap; ap++) {

-       FINDCOMP (cptr, *ap);
+       cptr = fmt_findcomp (*ap);

        if (cptr)
            cptr->c_type |= CT_ADDR;
     }
 
        if (cptr)
            cptr->c_type |= CT_ADDR;
     }
 

-    FINDCOMP (cptr, "addresses");
+    cptr = fmt_findcomp ("addresses");

     if (cptr)
        cptr->c_text = addrs;
 
     if (cptr)
        cptr->c_text = addrs;
 

-    for (state = FLD;;) {
-       switch (state = m_getfld (state, name, tmpbuf, SBUFSIZ, inb)) {
+    gstate = m_getfld_state_init(inb);
+    for (;;) {
+       int msg_count = sizeof tmpbuf;
+       switch (state = m_getfld2(&gstate, name, tmpbuf, &msg_count)) {

            case FLD: 
            case FLDPLUS: 
            case FLD: 
            case FLDPLUS: 

-               if ((cptr = wantcomp[CHASH (name)]))
-                   do {
-                       if (!mh_strcasecmp (name, cptr->c_name)) {
-                           char_read += msg_count;
-                           if (!cptr->c_text) {
-                               cptr->c_text = tmpbuf;
-                               *--savecomp = cptr;
-                               tmpbuf = *nxtbuf++;
-                           }
-                           else {
-                               i = strlen (cp = cptr->c_text) - 1;
-                               if (cp[i] == '\n') {
-                                   if (cptr->c_type & CT_ADDR) {
-                                       cp[i] = 0;
-                                       cp = add (",\n\t", cp);
-                                   }
-                                   else
-                                       cp = add ("\t", cp);
-                               }
-                               cptr->c_text = add (tmpbuf, cp);
-                           }
-                           while (state == FLDPLUS) {
-                               state = m_getfld (state, name, tmpbuf,
-                                                 SBUFSIZ, inb);
-                               cptr->c_text = add (tmpbuf, cptr->c_text);
-                               char_read += msg_count;
-                           }
-                           break;
-                       }
-                   } while ((cptr = cptr->c_next));
-
-               while (state == FLDPLUS)
-                   state = m_getfld (state, name, tmpbuf, SBUFSIZ, inb);
+               i = fmt_addcomptext(name, tmpbuf);
+               if (i != -1) {
+                   char_read += msg_count;
+                   while (state == FLDPLUS) {
+                       msg_count = sizeof tmpbuf;
+                       state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
+                       fmt_appendcomp(i, name, tmpbuf);
+                       char_read += msg_count;
+                   }
+               }
+
+               while (state == FLDPLUS) {
+                   msg_count = sizeof tmpbuf;
+                   state = m_getfld2(&gstate, name, tmpbuf, &msg_count);
+               }

                break;
 
            case LENERR: 
                break;
 
            case LENERR: 


@@ -253,41 +239,37 @@ rcvdistout (FILE *inb, char *form, char *addrs)
                goto finished;
 
            default: 
                goto finished;
 
            default: 

-               adios (NULL, "m_getfld() returned %d", state);
+               die("m_getfld2() returned %d", state);

        }
     }
 finished: ;
        }
     }
 finished: ;

+    m_getfld_state_destroy (&gstate);

 
     i = format_len + char_read + 256;
 
     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, 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);
-    for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++); nxtbuf++, i--)
-       free (cptr->c_text);
-    while (i-- > 0)
-        free (*nxtbuf++);
-    free ((char *) compbuffers);
-    free ((char *) used_buf);
+    charstring_free (scanl);
+    fmt_free(fmt, 1);

 }
 
 
 }
 
 

-static void
+static void NORETURN

 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 ? 1 : 0);

 }
 }