Made the RPATHS config option the default and removed the #ifdefs.

[mmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 8e02e57..75dec1c 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -37,24 +37,21 @@
 #define SBUFSIZ 512
 
 static struct format *fmt;
-#ifdef JLR
-static struct format *fmt_top;
-#endif /* JLR */
 
 static struct comp *datecomp;  /* pntr to "date" comp */
 static struct comp *bodycomp;  /* pntr to "body" pseudo-comp (if referenced) */
 static int ncomps = 0;  /* # of interesting components */
-static char **compbuffers = 0;  /* buffers for component text */
-static struct comp **used_buf = 0;  /* stack for comp that use buffers */
+static char **compbuffers = NULL;  /* buffers for component text */
+static struct comp **used_buf = NULL;  /* stack for comp that use buffers */
 
 static int dat[5];  /* aux. data for format routine */
 
-char *scanl = 0;  /* text of most recent scanline */
+char *scanl = NULL;  /* text of most recent scanline */
 
 #define DIEWRERR() adios(scnmsg, "write error on")
 
 #define FPUTS(buf) {\
-               if (mh_fputs(buf,scnout) == EOF)\
+               if (fputs(buf,scnout) == EOF)\
                        DIEWRERR();\
        }
 
@@ -62,7 +59,6 @@ char *scanl = 0;  /* text of most recent scanline */
 ** prototypes
 */
 int sc_width(void);  /* from termsbr.c */
-static int mh_fputs(char *, FILE *);
 
 #ifdef MULTIBYTE_SUPPORT
 #define SCAN_CHARWIDTH MB_CUR_MAX
@@ -71,10 +67,10 @@ static int mh_fputs(char *, FILE *);
 #endif
 
 int
-scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
-       int unseen, char *folder, long size, int noisy)
+scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
+       int unseen)
 {
-       int i, compnum, encrypted, state;
+       int i, compnum, state;
        unsigned char *cp, *tmpbuf;
        char **nxtbuf;
        char *saved_c_text = NULL;
@@ -84,11 +80,8 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
        FILE *scnout = NULL;
        char name[NAMESZ];
        static int rlwidth, slwidth;
-
-#ifdef RPATHS
        char returnpath[BUFSIZ];
        char deliverydate[BUFSIZ];
-#endif
 
        /* first-time only initialization */
        if (!scanl) {
@@ -105,27 +98,10 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                        umask(~m_gmprot());
 
                /* Compile format string */
-               ncomps = fmt_compile(nfs, &fmt) + 1;
+               ncomps = fmt_compile(fmtstr, &fmt) + 1;
 
-#ifdef JLR
-               fmt_top = fmt;
-#endif /* JLR */
                FINDCOMP(bodycomp, "body");
                FINDCOMP(datecomp, "date");
-               FINDCOMP(cptr, "folder");
-               if (cptr && folder)
-                       cptr->c_text = folder;
-               FINDCOMP(cptr, "encrypted");
-               if (!cptr)
-                       if ((cptr = (struct comp *)calloc(1, sizeof(*cptr)))) {
-                               cptr->c_name = "encrypted";
-                               cptr->c_next = wantcomp[i = CHASH(cptr->c_name)];
-                               wantcomp[i] = cptr;
-                               ncomps++;
-               }
-               FINDCOMP(cptr, "dtimenow");
-               if (cptr)
-                       cptr->c_text = getcpy(dtimenow(0));
                nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
                                sizeof(char *));
                if (nxtbuf == NULL)
@@ -173,7 +149,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                }
                if ((scnout = fopen(scnmsg, "w")) == NULL)
                        adios(scnmsg, "unable to write");
-#ifdef RPATHS
                /*
                ** Add the Return-Path and Delivery-Date
                ** header fields to message.
@@ -185,7 +160,6 @@ scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
                        FPUTS("Delivery-Date: ");
                        FPUTS(deliverydate);
                }
-#endif /* RPATHS */
        }
 
        /* scan - main loop */
@@ -318,19 +292,17 @@ finished:
                bodycomp->c_text = tmpbuf;
        }
 
-       if (size)
-               dat[2] = size;
-       else if (outnum > 0) {
+       if (outnum > 0) {
                dat[2] = ftell(scnout);
                if (dat[2] == EOF)
                        DIEWRERR();
        }
 
-       if ((datecomp && !datecomp->c_text) || (!size && !outnum)) {
+       if ((datecomp && !datecomp->c_text) || !outnum) {
                struct stat st;
 
                fstat(fileno(inb), &st);
-               if (!size && !outnum)
+               if (!outnum)
                        dat[2] = st.st_size;
                if (datecomp) {
                        if (! datecomp->c_text) {
@@ -351,12 +323,9 @@ finished:
        if (bodycomp)
                bodycomp->c_text = saved_c_text;
 
-       if (noisy)
+       if (fmtstr)
                fputs(scanl, stdout);
 
-       FINDCOMP(cptr, "encrypted");
-       encrypted = cptr && cptr->c_text;
-
        /* return dynamically allocated buffers to pool */
        while ((cptr = *savecomp++)) {
                *--nxtbuf = cptr->c_text;
@@ -367,16 +336,5 @@ finished:
        if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
                DIEWRERR();
 
-       return (state != FILEEOF ? SCNERR : encrypted ? SCNENC : SCNMSG);
-}
-
-static int
-mh_fputs(char *s, FILE *stream)
-{
-       char c;
-
-       while ((c = *s++))
-               if (putc(c,stream) == EOF )
-                       return(EOF);
-       return (0);
+       return (state != FILEEOF ? SCNERR : SCNMSG);
 }