Remove MIME content caching code

[nmh] / uip / replsbr.c

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 2cb06ecec460927f2fa643b975acef3f2f536fc8..ed5e94ed9b3cbfa06ea22a2b9f326830897f8c75 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -5,16 +5,29 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/addrsbr.h>
-#include <h/fmt_scan.h>
-#include <h/utils.h>
-#include <sys/file.h>          /* L_SET */
-
-extern short ccto;             /* from repl.c */
-extern short cccc;
-extern short ccme;
-extern short querysw;
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/m_getfld.h"
+#include "sbr/read_switch.h"
+#include "sbr/concat.h"
+#include "sbr/uprf.h"
+#include "sbr/escape_addresses.h"
+#include "sbr/pidstatus.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/addrsbr.h"
+#include "h/fmt_scan.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include <sys/file.h>
+#include "replsbr.h"
+
+short ccto = -1;
+short cccc = -1;
+short ccme = -1;
+short querysw = 0;

 
 static int dftype=0;
 
 
 static int dftype=0;
 


@@ -22,16 +35,7 @@ static char *badaddrs = NULL;
 static char *dfhost = NULL;
 
 static struct mailname mq;
 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 NMH_BUFSIZ
+static bool nodupcheck;                /* If set, no check for duplicates */

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


@@ -65,14 +69,14 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
 {
     int state, i;
     struct comp *cptr;
 {
     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 */
     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;
     struct fmt_callbacks cb;
 
     FILE *out;


@@ -119,9 +123,10 @@ 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) {
            case FLD:
            case FLDPLUS:
        switch (state) {
            case FLD:
            case FLDPLUS:


@@ -137,7 +142,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;
                    }


@@ -145,7 +150,7 @@ 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;
 


@@ -156,7 +161,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
                goto finished;
 
            default:
                goto finished;
 
            default:

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

        }
     }
 
        }
     }
 


@@ -169,7 +174,7 @@ finished:
     /* set up the "fcc" pseudo-component */
     cptr = fmt_findcomp ("fcc");
     if (cptr) {
     /* set up the "fcc" pseudo-component */
     cptr = fmt_findcomp ("fcc");
     if (cptr) {

-       mh_xfree(cptr->c_text);
+       free(cptr->c_text);

        if (fcc)
            cptr->c_text = mh_xstrdup(fcc);
        else
        if (fcc)
            cptr->c_text = mh_xstrdup(fcc);
        else


@@ -177,7 +182,7 @@ finished:
     }
     cptr = fmt_findcomp ("user");
     if (cptr) {
     }
     cptr = fmt_findcomp ("user");
     if (cptr) {

-       mh_xfree(cptr->c_text);
+       free(cptr->c_text);

        if ((cp = getenv("USER")))
            cptr->c_text = mh_xstrdup(cp);
        else
        if ((cp = getenv("USER")))
            cptr->c_text = mh_xstrdup(cp);
        else


@@ -213,7 +218,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);


@@ -288,8 +293,8 @@ static char *
 replformataddr (char *orig, char *str)
 {
     int len;
 replformataddr (char *orig, char *str)
 {
     int len;

-    char baddr[BUFSIZ], error[BUFSIZ];
-    int isgroup;
+    char baddr[BUFSIZ+6], error[BUFSIZ];
+    bool isgroup;

     char *dst;
     char *cp;
     char *sp;
     char *dst;
     char *cp;
     char *sp;


@@ -319,7 +324,7 @@ replformataddr (char *orig, char *str)
     }
 
     /* concatenate all the new addresses onto 'buf' */
     }
 
     /* concatenate all the new addresses onto 'buf' */

-    for (isgroup = 0; (cp = getname (fixed_str)); ) {
+    for (isgroup = false; (cp = getname (fixed_str)); ) {

        if ((mp = getm (cp, dfhost, dftype, error, sizeof(error))) == NULL) {
            snprintf (baddr, sizeof(baddr), "\t%s -- %s\n", cp, error);
            badaddrs = add (baddr, badaddrs);
        if ((mp = getm (cp, dfhost, dftype, error, sizeof(error))) == NULL) {
            snprintf (baddr, sizeof(baddr), "\t%s -- %s\n", cp, error);
            badaddrs = add (baddr, badaddrs);


@@ -327,7 +332,7 @@ replformataddr (char *orig, char *str)
        }
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';
        }
        if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
            *dst++ = ';';

-           isgroup = 0;
+           isgroup = false;

        }
        if (insert (mp)) {
            /* if we get here we're going to add an address */
        }
        if (insert (mp)) {
            /* if we get here we're going to add an address */


@@ -338,7 +343,7 @@ replformataddr (char *orig, char *str)
            if (mp->m_gname) {
                CHECKMEM (mp->m_gname);
                CPY (mp->m_gname);
            if (mp->m_gname) {
                CHECKMEM (mp->m_gname);
                CPY (mp->m_gname);

-               isgroup++;
+               isgroup = true;

            }
            sp = adrformat (mp);
            CHECKMEM (sp);
            }
            sp = adrformat (mp);
            CHECKMEM (sp);


@@ -353,7 +358,7 @@ replformataddr (char *orig, char *str)
 
     *dst = '\0';
     last_dst = dst;
 
     *dst = '\0';
     last_dst = dst;

-    return (buf);
+    return buf;

 }
 
 
 }
 
 


@@ -374,9 +379,9 @@ replconcataddr(char *orig, char *str)
 {
     char *cp;
 
 {
     char *cp;
 

-    nodupcheck = 1;
+    nodupcheck = true;

     cp = replformataddr(orig, str);
     cp = replformataddr(orig, str);

-    nodupcheck = 0;
+    nodupcheck = false;

     return cp;
 }
 
     return cp;
 }
 


@@ -393,10 +398,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))


@@ -435,7 +440,7 @@ 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);
 
 
     arglist = argsplit(mhlproc, &mhl, &argnum);
 


@@ -446,7 +451,6 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
        case OK:
            dup2 (fileno (in), fileno (stdin));
            dup2 (fileno (out), fileno (stdout));
        case OK:
            dup2 (fileno (in), fileno (stdin));
            dup2 (fileno (out), fileno (stdout));

-           closefds (3);

 
            /*
             * We're not allocating the memory for the extra arguments,
 
            /*
             * We're not allocating the memory for the extra arguments,


@@ -478,22 +482,23 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
                write(2, "\n", 1) < 0) {
                advise ("stderr", "write");
            }
                write(2, "\n", 1) < 0) {
                advise ("stderr", "write");
            }

-           _exit (-1);
+           _exit(1);

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

+            arglist_free(mhl, arglist);

            break;
     }
 }
 
 
            break;
     }
 }
 
 

-static
-char *
-fix_addresses (char *str) {
+static char *
+fix_addresses (char *str)
+{

     char *fixed_str = NULL;
     char *fixed_str = NULL;

-    int fixed_address = 0;
+    bool fixed_address = false;

 
     if (str) {
         /*
 
     if (str) {
         /*


@@ -570,7 +575,7 @@ fix_addresses (char *str) {
                 adr = getname (new_adr);
                 if (adr != NULL  &&
                     (mp = getm (adr, dfhost, dftype, NULL, 0)) != NULL) {
                 adr = getname (new_adr);
                 if (adr != NULL  &&
                     (mp = getm (adr, dfhost, dftype, NULL, 0)) != NULL) {

-                    fixed_address = 1;
+                    fixed_address = true;

                     mnfree (mp);
                 }
                 free (angle_addr);
                     mnfree (mp);
                 }
                 free (angle_addr);