Refactoring in scansbr.c. Especially, took the logic out of `outnum'.

There's more to do here.

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 75dec1c..dca761c 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -48,11 +48,9 @@ static int dat[5];  /* aux. data for format routine */
 
 char *scanl = NULL;  /* text of most recent scanline */
 
-#define DIEWRERR() adios(scnmsg, "write error on")
-
 #define FPUTS(buf) {\
                if (fputs(buf,scnout) == EOF)\
-                       DIEWRERR();\
+                       adios(scnmsg, "write error on");\
        }
 
 /*
@@ -82,6 +80,8 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
        static int rlwidth, slwidth;
        char returnpath[BUFSIZ];
        char deliverydate[BUFSIZ];
+       int incing = (outnum > 0);
+       int ismbox = (outnum != 0);
 
        /* first-time only initialization */
        if (!scanl) {
@@ -94,7 +94,7 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                dat[3] = slwidth = width;
                scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
                                (slwidth + 2) );
-               if (outnum)
+               if (incing)
                        umask(~m_gmprot());
 
                /* Compile format string */
@@ -139,8 +139,8 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                }
        }
 
-       if (outnum) {
-               if (outnum > 0) {
+       if (ismbox) {
+               if (incing) {
                        scnmsg = m_name(outnum);
                        if (*scnmsg == '?')  /* msg num out of range */
                                return SCNNUM;
@@ -169,10 +169,10 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                case FLD:
                case FLDPLUS:
                        compnum++;
-                       if (outnum) {
+                       if (incing) {
                                FPUTS(name);
                                if (putc(':', scnout) == EOF)
-                                       DIEWRERR();
+                                       adios(scnmsg, "write error on");
                                FPUTS(tmpbuf);
                        }
                        /*
@@ -203,18 +203,19 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                        while (state == FLDPLUS) {
                                state = m_getfld(state, name, tmpbuf, rlwidth,
                                                inb);
-                               if (outnum)
+                               if (incing)
                                        FPUTS(tmpbuf);
                        }
                        break;
 
                case BODY:
                        compnum = -1;
-                       if (! outnum) {
+                       if (!incing) {
                                state = FILEEOF; /* stop now if scan cmd */
                                goto finished;
                        }
-                       if (putc('\n', scnout) == EOF) DIEWRERR();
+                       if (putc('\n', scnout) == EOF)
+                               adios(scnmsg, "write error on");
                        FPUTS(tmpbuf);
                        /*
                        ** performance hack: some people like to run "inc"
@@ -237,7 +238,7 @@ body:;
                                if (scnout->_cnt <= 0) {
 #endif
                                        if (fflush(scnout) == EOF)
-                                               DIEWRERR();
+                                               adios(scnmsg, "write error on");
                                }
 #ifdef LINUX_STDIO
                                state = m_getfld(state, name, scnout->_IO_write_ptr, (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
@@ -247,7 +248,7 @@ body:;
                                ((struct __FILE_public *)scnout)->_w -= msg_count;
                                ((struct __FILE_public *)scnout)->_p += msg_count;
 #else
-                               state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb);
+                               state = m_getfld(state, name, scnout->_ptr, -(scnout->_cnt), inb);
                                scnout->_cnt -= msg_count;
                                scnout->_ptr += msg_count;
 #endif
@@ -259,11 +260,13 @@ body:;
                        fprintf(stderr, innum ? "??Format error (message %d) in " : "??Format error in ", outnum ? outnum : innum);
                        fprintf(stderr, "component %d\n", compnum);
 
-                       if (outnum) {
+                       if (incing) {
                                FPUTS("\n\nBAD MSG:\n");
                                FPUTS(name);
                                if (putc('\n', scnout) == EOF)
-                                       DIEWRERR();
+                                       adios(scnmsg, "write error on");
+                       }
+                       if (ismbox) {
                                state = BODY;
                                goto body;
                        }
@@ -277,12 +280,11 @@ body:;
                }
        }
 
-       /*
-       ** format and output the scan line.
-       */
 finished:
+
+       /* Format and output the scan line. */
        if (ferror(inb)) {
-               advise("read", "unable to"); /* "read error" */
+               advise("read", "unable to");
                return SCNFAT;
        }
 
@@ -292,17 +294,16 @@ finished:
                bodycomp->c_text = tmpbuf;
        }
 
-       if (outnum > 0) {
-               dat[2] = ftell(scnout);
-               if (dat[2] == EOF)
-                       DIEWRERR();
+       if (incing) {
+               if ((dat[2] = ftell(scnout)) == EOF)
+                       adios(scnmsg, "write error on");
        }
 
-       if ((datecomp && !datecomp->c_text) || !outnum) {
+       if ((datecomp && !datecomp->c_text) || !ismbox) {
                struct stat st;
 
                fstat(fileno(inb), &st);
-               if (!outnum)
+               if (!ismbox)
                        dat[2] = st.st_size;
                if (datecomp) {
                        if (! datecomp->c_text) {
@@ -318,14 +319,14 @@ finished:
                }
        }
 
+       /* print the scan line */
        fmt_scan(fmt, scanl, slwidth, dat);
+       if (fmtstr)
+               fputs(scanl, stdout);
 
        if (bodycomp)
                bodycomp->c_text = saved_c_text;
 
-       if (fmtstr)
-               fputs(scanl, stdout);
-
        /* return dynamically allocated buffers to pool */
        while ((cptr = *savecomp++)) {
                *--nxtbuf = cptr->c_text;
@@ -333,8 +334,8 @@ finished:
        }
        *--nxtbuf = tmpbuf;
 
-       if (outnum && (ferror(scnout) || fclose(scnout) == EOF))
-               DIEWRERR();
+       if (ismbox && (ferror(scnout) || fclose(scnout) == EOF))
+               adios(scnmsg, "write error on");
 
        return (state != FILEEOF ? SCNERR : SCNMSG);
 }