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 43948bfde9b027bedb196bd8df2b46730f7e8b76..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
@@ -26,15 +24,6 @@ static char *dfhost = NULL;
 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",
@@ -67,14 +56,14 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 {
     int state, i;
     struct comp *cptr;
-    char tmpbuf[SBUFSIZ];
+    char tmpbuf[NMH_BUFSIZ];
     struct format *fmt;
     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 */
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
     struct fmt_callbacks cb;
 
     FILE *out;
@@ -115,26 +104,16 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
        if (cptr)
            cptr->c_name = mh_xstrdup("");
     }
-    /* set up the "fcc" pseudo-component */
-    if (fcc) {
-       cptr = fmt_findcomp ("fcc");
-       if (cptr)
-           cptr->c_text = mh_xstrdup(fcc);
-    }
-    if ((cp = getenv("USER"))) {
-       cptr = fmt_findcomp ("user");
-       if (cptr)
-           cptr->c_text = mh_xstrdup(cp);
-    }
     if (!ccme)
        ismymbox (NULL);
 
     /*
      * pick any interesting stuff out of msg "inb"
      */
+    gstate = m_getfld_state_init(inb);
     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) {
            case FLD:
            case FLDPLUS:
@@ -150,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;
-                       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;
                    }
@@ -158,7 +137,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 
                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;
 
@@ -169,7 +148,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                goto finished;
 
            default:
-               adios (NULL, "m_getfld() returned %d", state);
+               adios (NULL, "m_getfld2() returned %d", state);
        }
     }
 
@@ -179,6 +158,24 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 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
      */
@@ -208,7 +205,7 @@ finished:
     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);
@@ -388,10 +385,10 @@ insert (struct mailname *np)
        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))
@@ -430,7 +427,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
        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);
 
@@ -479,6 +476,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
            if (pidXwait (pid, mhl))
                done (1);
            fseek (out, 0L, SEEK_END);
+            arglist_free(mhl, arglist);
            break;
     }
 }
@@ -518,7 +516,7 @@ fix_addresses (char *str) {
             struct mailname *mp;
 
             NEW(adr_nodep);
-            adr_nodep->adr = strdup (cp);
+            adr_nodep->adr = mh_xstrdup (cp);
             adr_nodep->escape_local_part = 0;
             adr_nodep->fixed = 0;
             adr_nodep->next = NULL;
@@ -545,12 +543,12 @@ fix_addresses (char *str) {
          * 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, '<');
-                char *angle_addr = strdup (local_part_end);
+                char *angle_addr = mh_xstrdup (local_part_end);
                 struct mailname *mp;
                 char *new_adr, *adr;
 
@@ -571,7 +569,7 @@ fix_addresses (char *str) {
                 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;
@@ -594,7 +592,7 @@ fix_addresses (char *str) {
                     free (fixed_str);
                     fixed_str = new_str;
                 } else {
-                    fixed_str = strdup (np->adr);
+                    fixed_str = mh_xstrdup (np->adr);
                 }
             }
 
@@ -608,5 +606,5 @@ fix_addresses (char *str) {
         return fixed_str;
     }
     free (fixed_str);
-    return str  ?  strdup (str)  :  NULL;
+    return str  ?  mh_xstrdup (str)  :  NULL;
 }