lock_file.c: close(2) file descriptor on failure, avoiding leak.

[nmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 6380884c50262233d9e4dffaa4d82f1531fdc93c..b5e10827d3e2f2b7affe6b4a3b8688e57c0657b6 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -1,6 +1,4 @@
-
-/*
- * replsbr.c -- routines to help repl along...
+/* replsbr.c -- routines to help repl along...

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


@@ -26,15 +24,6 @@ static char *dfhost = NULL;
 static struct mailname mq;
 static int nodupcheck = 0;             /* If set, no check for duplicates */
 
 static struct mailname mq;
 static int nodupcheck = 0;             /* If set, no check for duplicates */
 

-/*
- * Buffer size for content part of header fields.
- * We want this to be large enough so that we don't
- * do a lot of extra FLDPLUS calls on m_getfld but
- * small enough so that we don't snarf the entire
- * message body when we're not going to use any of it.
- */
-#define SBUFSIZ 256            
-

 static char *addrcomps[] = {
     "from",
     "sender",
 static char *addrcomps[] = {
     "from",
     "sender",


@@ -65,16 +54,16 @@ void
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
        int mime, char *form, char *filter, char *fcc, int fmtproc)
 {
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
        int mime, char *form, char *filter, char *fcc, int fmtproc)
 {

-    register int state, i;
-    register struct comp *cptr;
-    char tmpbuf[SBUFSIZ];
+    int state, i;
+    struct comp *cptr;
+    char tmpbuf[NMH_BUFSIZ];

     struct format *fmt;
     struct format *fmt;

-    register char **ap;
+    char **ap;

     int        char_read = 0, format_len, mask;
     char name[NAMESZ], *cp;
     charstring_t scanl;
     static int dat[5];                 /* aux. data for format routine */
     int        char_read = 0, format_len, mask;
     char name[NAMESZ], *cp;
     charstring_t scanl;
     static int dat[5];                 /* aux. data for format routine */

-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;

     struct fmt_callbacks cb;
 
     FILE *out;
     struct fmt_callbacks cb;
 
     FILE *out;


@@ -104,30 +93,16 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
      *
      * This prevents the component from being found via fmt_findcomp(),
      * which makes sure no text gets added to it when the message is processed.
      *
      * This prevents the component from being found via fmt_findcomp(),
      * which makes sure no text gets added to it when the message is processed.

-     *
-     * getcpy(NULL) returns a malloc'd zero-length string, so it can safely
-     * be free()'d later.

      */
     if (!ccto) {
        cptr = fmt_findcomp ("to");
        if (cptr)
      */
     if (!ccto) {
        cptr = fmt_findcomp ("to");
        if (cptr)

-           cptr->c_name = getcpy(NULL);
+           cptr->c_name = mh_xstrdup("");

     }
     if (!cccc) {
         cptr = fmt_findcomp("cc");
        if (cptr)
     }
     if (!cccc) {
         cptr = fmt_findcomp("cc");
        if (cptr)

-           cptr->c_name = getcpy(NULL);
-    }
-    /* set up the "fcc" pseudo-component */
-    if (fcc) {
-       cptr = fmt_findcomp ("fcc");
-       if (cptr)
-           cptr->c_text = getcpy (fcc);
-    }
-    if ((cp = getenv("USER"))) {
-       cptr = fmt_findcomp ("user");
-       if (cptr)
-           cptr->c_text = getcpy(cp);
+           cptr->c_name = mh_xstrdup("");

     }
     if (!ccme)
        ismymbox (NULL);
     }
     if (!ccme)
        ismymbox (NULL);


@@ -135,12 +110,13 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     /*
      * pick any interesting stuff out of msg "inb"
      */
     /*
      * pick any interesting stuff out of msg "inb"
      */

+    gstate = m_getfld_state_init(inb);

     for (;;) {
        int msg_count = sizeof tmpbuf;
     for (;;) {
        int msg_count = sizeof tmpbuf;

-       state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+       state = m_getfld2(&gstate, name, tmpbuf, &msg_count);

        switch (state) {
        switch (state) {

-           case FLD: 
-           case FLDPLUS: 
+           case FLD:
+           case FLDPLUS:

                /*
                 * if we're interested in this component, save a pointer
                 * to the component text, then start using our next free
                /*
                 * if we're interested in this component, save a pointer
                 * to the component text, then start using our next free


@@ -153,7 +129,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                    char_read += msg_count;
                    while (state == FLDPLUS) {
                        msg_count= sizeof tmpbuf;
                    char_read += msg_count;
                    while (state == FLDPLUS) {
                        msg_count= sizeof tmpbuf;

-                       state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+                       state = m_getfld2(&gstate, name, tmpbuf, &msg_count);

                        fmt_appendcomp(i, name, tmpbuf);
                        char_read += msg_count;
                    }
                        fmt_appendcomp(i, name, tmpbuf);
                        char_read += msg_count;
                    }


@@ -161,18 +137,18 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 
                while (state == FLDPLUS) {
                    msg_count= sizeof tmpbuf;
 
                while (state == FLDPLUS) {
                    msg_count= sizeof tmpbuf;

-                   state = m_getfld (&gstate, name, tmpbuf, &msg_count, inb);
+                   state = m_getfld2(&gstate, name, tmpbuf, &msg_count);

                }
                break;
 
                }
                break;
 

-           case LENERR: 
-           case FMTERR: 
-           case BODY: 
+           case LENERR:
+           case FMTERR:
+           case BODY:

            case FILEEOF:
                goto finished;
 
            case FILEEOF:
                goto finished;
 

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

        }
     }
 
        }
     }
 


@@ -182,12 +158,30 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 finished:
     m_getfld_state_destroy (&gstate);
 
 finished:
     m_getfld_state_destroy (&gstate);
 

+    /* set up the "fcc" pseudo-component */
+    cptr = fmt_findcomp ("fcc");
+    if (cptr) {
+       free(cptr->c_text);
+       if (fcc)
+           cptr->c_text = mh_xstrdup(fcc);
+       else
+           cptr->c_text = NULL;
+    }
+    cptr = fmt_findcomp ("user");
+    if (cptr) {
+       free(cptr->c_text);
+       if ((cp = getenv("USER")))
+           cptr->c_text = mh_xstrdup(cp);
+       else
+           cptr = NULL;
+    }
+

     /*
      * if there's a "Subject" component, strip any "Re:"s off it
      */
     cptr = fmt_findcomp ("subject");
     if (cptr && (cp = cptr->c_text)) {
     /*
      * if there's a "Subject" component, strip any "Re:"s off it
      */
     cptr = fmt_findcomp ("subject");
     if (cptr && (cp = cptr->c_text)) {

-       register char *sp = cp;
+       char *sp = cp;

 
        for (;;) {
            while (isspace((unsigned char) *cp))
 
        for (;;) {
            while (isspace((unsigned char) *cp))


@@ -200,7 +194,7 @@ finished:
        }
        if (sp != cptr->c_text) {
            cp = cptr->c_text;
        }
        if (sp != cptr->c_text) {
            cp = cptr->c_text;

-           cptr->c_text = getcpy (sp);
+           cptr->c_text = mh_xstrdup(sp);

            free (cp);
        }
     }
            free (cp);
        }
     }


@@ -211,7 +205,7 @@ finished:
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;
     dat[2] = 0;
     dat[3] = outputlinelen;
     dat[4] = 0;

-    memset(&cb, 0, sizeof(cb));
+    ZERO(&cb);

     cb.formataddr = replformataddr;
     cb.concataddr = replconcataddr;
     fmt_scan (fmt, scanl, i, dat, &cb);
     cb.formataddr = replformataddr;
     cb.concataddr = replconcataddr;
     fmt_scan (fmt, scanl, i, dat, &cb);


@@ -285,13 +279,13 @@ static unsigned int bufsiz=0;     /* current size of buf */
 static char *
 replformataddr (char *orig, char *str)
 {
 static char *
 replformataddr (char *orig, char *str)
 {

-    register int len;
+    int len;

     char baddr[BUFSIZ], error[BUFSIZ];
     char baddr[BUFSIZ], error[BUFSIZ];

-    register int isgroup;
-    register char *dst;
-    register char *cp;
-    register char *sp;
-    register struct mailname *mp = NULL;
+    int isgroup;
+    char *dst;
+    char *cp;
+    char *sp;
+    struct mailname *mp = NULL;

     char *fixed_str = fix_addresses (str);
 
     /* if we don't have a buffer yet, get one */
     char *fixed_str = fix_addresses (str);
 
     /* if we don't have a buffer yet, get one */


@@ -382,7 +376,7 @@ static int
 insert (struct mailname *np)
 {
     char buffer[BUFSIZ];
 insert (struct mailname *np)
 {
     char buffer[BUFSIZ];

-    register struct mailname *mp;
+    struct mailname *mp;

 
     if (nodupcheck)
        return 1;
 
     if (nodupcheck)
        return 1;


@@ -391,10 +385,10 @@ insert (struct mailname *np)
        return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {
        return 0;
 
     for (mp = &mq; mp->m_next; mp = mp->m_next) {

-       if (!strcasecmp (np->m_host ? np->m_host : "",
-                        mp->m_next->m_host ? mp->m_next->m_host : "")  &&
-           !strcasecmp (np->m_mbox ? np->m_mbox : "",
-                        mp->m_next->m_mbox ? mp->m_next->m_mbox : ""))
+       if (!strcasecmp (FENDNULL(np->m_host),
+                        FENDNULL(mp->m_next->m_host))  &&
+           !strcasecmp (FENDNULL(np->m_mbox),
+                        FENDNULL(mp->m_next->m_mbox)))

            return 0;
     }
     if (!ccme && ismymbox (np))
            return 0;
     }
     if (!ccme && ismymbox (np))


@@ -433,15 +427,15 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
        adios (filter, "unable to read");
 
     rewind (in);
        adios (filter, "unable to read");
 
     rewind (in);

-    lseek (fileno(in), (off_t) 0, SEEK_SET);
+    lseek(fileno(in), 0, SEEK_SET);

 
     arglist = argsplit(mhlproc, &mhl, &argnum);
 
     switch (pid = fork()) {
 
     arglist = argsplit(mhlproc, &mhl, &argnum);
 
     switch (pid = fork()) {

-       case NOTOK: 
+       case NOTOK:

            adios ("fork", "unable to");
 
            adios ("fork", "unable to");
 

-       case OK: 
+       case OK:

            dup2 (fileno (in), fileno (stdin));
            dup2 (fileno (out), fileno (stdout));
            closefds (3);
            dup2 (fileno (in), fileno (stdin));
            dup2 (fileno (out), fileno (stdout));
            closefds (3);


@@ -478,10 +472,11 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
            }
            _exit (-1);
 
            }
            _exit (-1);
 

-       default: 
+       default:

            if (pidXwait (pid, mhl))
                done (1);
            fseek (out, 0L, SEEK_END);
            if (pidXwait (pid, mhl))
                done (1);
            fseek (out, 0L, SEEK_END);

+            arglist_free(mhl, arglist);

            break;
     }
 }
            break;
     }
 }


@@ -516,11 +511,12 @@ fix_addresses (char *str) {
          * local part.
          */
         while ((cp = getname (str))) {
          * local part.
          */
         while ((cp = getname (str))) {

-            struct adr_node *adr_nodep = mh_xmalloc (sizeof *adr_nodep);
+            struct adr_node *adr_nodep;

             char error[BUFSIZ];
             struct mailname *mp;
 
             char error[BUFSIZ];
             struct mailname *mp;
 

-            adr_nodep->adr = strdup (cp);
+            NEW(adr_nodep);
+            adr_nodep->adr = mh_xstrdup (cp);

             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
             adr_nodep->next = NULL;
             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
             adr_nodep->next = NULL;


@@ -531,7 +527,7 @@ fix_addresses (char *str) {
                 const char *no_at_sign = "no at-sign after local-part";
 
                 adr_nodep->escape_local_part =
                 const char *no_at_sign = "no at-sign after local-part";
 
                 adr_nodep->escape_local_part =

-                    ! strncmp (error, no_at_sign, strlen (no_at_sign));
+                    has_prefix(error, no_at_sign);

             } else {
                 mnfree (mp);
             }
             } else {
                 mnfree (mp);
             }


@@ -547,12 +543,12 @@ fix_addresses (char *str) {
          * Walk the list and try to fix broken addresses.
          */
         for (np = adrs; np; np = np->next) {
          * Walk the list and try to fix broken addresses.
          */
         for (np = adrs; np; np = np->next) {

-            char *display_name = strdup (np->adr);
+            char *display_name = mh_xstrdup (np->adr);

             size_t len = strlen (display_name);
 
             if (np->escape_local_part) {
                 char *local_part_end = strrchr (display_name, '<');
             size_t len = strlen (display_name);
 
             if (np->escape_local_part) {
                 char *local_part_end = strrchr (display_name, '<');

-                char *angle_addr = strdup (local_part_end);
+                char *angle_addr = mh_xstrdup (local_part_end);

                 struct mailname *mp;
                 char *new_adr, *adr;
 
                 struct mailname *mp;
                 char *new_adr, *adr;
 


@@ -573,7 +569,7 @@ fix_addresses (char *str) {
                 free (angle_addr);
                 free (new_adr);
                 free (np->adr);
                 free (angle_addr);
                 free (new_adr);
                 free (np->adr);

-                np->adr = strdup (adr);
+                np->adr = mh_xstrdup (adr);

 
                 /* Need to flush getname() */
                 while ((cp = getname (""))) continue;
 
                 /* Need to flush getname() */
                 while ((cp = getname (""))) continue;


@@ -596,7 +592,7 @@ fix_addresses (char *str) {
                     free (fixed_str);
                     fixed_str = new_str;
                 } else {
                     free (fixed_str);
                     fixed_str = new_str;
                 } else {

-                    fixed_str = strdup (np->adr);
+                    fixed_str = mh_xstrdup (np->adr);

                 }
             }
 
                 }
             }
 


@@ -608,8 +604,7 @@ fix_addresses (char *str) {
 
     if (fixed_address) {
         return fixed_str;
 
     if (fixed_address) {
         return fixed_str;

-    } else {
-        free (fixed_str);
-        return str  ?  strdup (str)  :  NULL;

     }
     }

+    free (fixed_str);
+    return str  ?  mh_xstrdup (str)  :  NULL;

 }
 }