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 69f385a..75dec1c 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -67,7 +67,7 @@ int sc_width(void);  /* from termsbr.c */
 #endif
 
 int
-scan(FILE *inb, int innum, int outnum, char *nfs, int width, int curflg,
+scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
        int unseen)
 {
        int i, compnum, state;
@@ -80,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) {
@@ -101,7 +98,7 @@ 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;
 
                FINDCOMP(bodycomp, "body");
                FINDCOMP(datecomp, "date");
@@ -152,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.
@@ -164,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 */
@@ -328,7 +323,7 @@ finished:
        if (bodycomp)
                bodycomp->c_text = saved_c_text;
 
-       if (nfs)
+       if (fmtstr)
                fputs(scanl, stdout);
 
        /* return dynamically allocated buffers to pool */