No error-checking for error-checking alloc functions
[mmh] / uip / scansbr.c
index eba09f0..d985a5c 100644 (file)
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <sysexits.h>
 
 #ifdef _FSTDIO
 # define _ptr _p  /* Gag */
 # define _cnt _w  /* Wretch */
 #endif
 
-#ifdef SCO_5_STDIO
-# define _ptr  __ptr
-# define _cnt  __cnt
-# define _base __base
-# define _filbuf(fp)  ((fp)->__cnt = 0, __filbuf(fp))
-#endif
-
 #define MAXSCANL 256  /* longest possible scan line */
 
 /*
@@ -47,7 +43,7 @@ char *scanl = NULL;  /* text of most recent scanline */
 
 #define FPUTS(buf) {\
                if (fputs(buf, scnout) == EOF)\
-                       adios(scnmsg, "write error on");\
+                       adios(EX_IOERR, scnmsg, "write error on");\
        }
 
 /*
@@ -74,38 +70,38 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
        char *scnmsg = NULL;
        FILE *scnout = NULL;
        char name[NAMESZ];
-       char returnpath[BUFSIZ];
-       char deliverydate[BUFSIZ];
        int incing = (outnum != SCN_MBOX && outnum != SCN_FOLD);
        int scanfolder = (outnum == SCN_FOLD);
        long fpos;
+       struct stat st;
 
        /* first-time only initialization */
        if (!scanl) {
-               if (width == 0) {
-                       if ((width = sc_width()) < WIDTH/2)
-                               width = WIDTH/2;
-                       else if (width > MAXSCANL)
-                               width = MAXSCANL;
-               }
-               dat[3] = slwidth = width;
-               scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
-                               (slwidth + 2));  /* probably for \n and \0 */
                if (incing)
                        umask(~m_gmprot());
 
-               /* Compile format string */
-               ncomps = fmt_compile(fmtstr, &fmt) + 1;
+               if (fmtstr) {
+                       if (width == 0) {
+                               if ((width = sc_width()) < WIDTH/2)
+                                       width = WIDTH/2;
+                               else if (width > MAXSCANL)
+                                       width = MAXSCANL;
+                       }
+                       dat[3] = slwidth = width;
+                       scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
+                                       (slwidth + 2));  /* probably for \n and \0 */
+                       /* Compile format string */
+                       ncomps = fmt_compile(fmtstr, &fmt) + 1;
+                       FINDCOMP(datecomp, "date");
+               } else {
+                       ncomps = 1;
+                       datecomp = NULL;
+               }
 
-               FINDCOMP(datecomp, "date");
-               nxtbuf = compbuffers = (char **) calloc((size_t) ncomps,
+               nxtbuf = compbuffers = (char **) mh_xcalloc((size_t) ncomps,
                                sizeof(char *));
-               if (!nxtbuf)
-                       adios(NULL, "unable to allocate component buffers");
-               used_buf = (struct comp **) calloc((size_t) (ncomps+1),
+               used_buf = (struct comp **) mh_xcalloc((size_t) (ncomps+1),
                                sizeof(struct comp *));
-               if (!used_buf)
-                       adios(NULL, "unable to allocate component buffer stack");
                /* NULL-terminate array */
                used_buf += ncomps;
                *used_buf = NULL;
@@ -143,18 +139,7 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                if (*scnmsg == '?')  /* msg num out of range */
                        return SCNNUM;
                if (!(scnout = fopen(scnmsg, "w")))
-                       adios(scnmsg, "unable to write");
-               /*
-               ** Add the Return-Path and Delivery-Date
-               ** header fields to message.
-               */
-               if (get_returnpath(returnpath, sizeof(returnpath),
-                               deliverydate, sizeof(deliverydate))) {
-                       FPUTS("Return-Path: ");
-                       FPUTS(returnpath);
-                       FPUTS("Delivery-Date: ");
-                       FPUTS(deliverydate);
-               }
+                       adios(EX_IOERR, scnmsg, "unable to write");
        }
 
        /* scan - main loop */
@@ -176,21 +161,24 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                        ** temp buffer (buffer switching saves an extra
                        ** copy of the component text).
                        */
-                       if ((cptr = wantcomp[CHASH(name)])) {
+                       if (fmtstr && (cptr = wantcomp[CHASH(name)])) {
                                do {
-                                       if (!mh_strcasecmp(name, cptr->c_name)) {
-                                               if (! cptr->c_text) {
-                                                       cptr->c_text = tmpbuf;
-                                                       for (cp = tmpbuf + strlen(tmpbuf) - 1; cp >= tmpbuf; cp--)
-                                                               if (isspace(*cp))
-                                                                       *cp = 0;
-                                                               else
-                                                                       break;
-                                                       *--savecomp = cptr;
-                                                       tmpbuf = *nxtbuf++;
+                                       if (mh_strcasecmp(name, cptr->c_name)!=0) {
+                                               continue;
+                                       }
+                                       if (!cptr->c_text) {
+                                               cptr->c_text = tmpbuf;
+                                               cp = tmpbuf+strlen(tmpbuf)-1;
+                                               for (; cp >= tmpbuf; cp--) {
+                                                       if (isspace(*cp))
+                                                               *cp = '\0';
+                                                       else
+                                                               break;
                                                }
-                                               break;
+                                               *--savecomp = cptr;
+                                               tmpbuf = *nxtbuf++;
                                        }
+                                       break;
                                } while ((cptr = cptr->c_next));
                        }
 
@@ -242,7 +230,7 @@ body:;
                        goto finished;
 
                default:
-                       adios(NULL, "getfld() returned %d", state);
+                       adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
                }
        }
 
@@ -256,37 +244,35 @@ finished:
 
        if (incing) {
                if ((dat[2] = ftell(scnout)) == EOF)
-                       adios(scnmsg, "write error on");
+                       adios(EX_IOERR, scnmsg, "write error on");
        } else if (!scanfolder) {
                if ((dat[2] = ftell(inb)) == EOF)
-                       adios(scnmsg, "write error on");
+                       adios(EX_IOERR, scnmsg, "write error on");
                dat[2] -= fpos;
        }
 
-       if ((datecomp && !datecomp->c_text) || scanfolder) {
-               struct stat st;
-
+       if (fmtstr) {
                fstat(fileno(inb), &st);
-               if (scanfolder)
+               if (scanfolder) {
                        dat[2] = st.st_size;
-               if (datecomp) {
+               }
+               if (datecomp && !datecomp->c_text) {
                        if (!datecomp->c_text) {
                                if (!datecomp->c_tws)
-                                       datecomp->c_tws = (struct tws *) calloc((size_t) 1, sizeof(*datecomp->c_tws));
+                                       datecomp->c_tws = (struct tws *) mh_xcalloc((size_t) 1, sizeof(*datecomp->c_tws));
                                if (!datecomp->c_tws)
-                                       adios(NULL, "unable to allocate tws buffer");
+                                       adios(EX_OSERR, NULL, "unable to allocate tws buffer");
                                *datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);
                                datecomp->c_flags |= CF_DATEFAB|CF_TRUE;
                        } else {
                                datecomp->c_flags &= ~CF_DATEFAB;
                        }
                }
-       }
 
-       /* print the scan line */
-       fmt_scan(fmt, scanl, slwidth, dat);
-       if (fmtstr)
+               /* print the scan line */
+               fmt_scan(fmt, scanl, slwidth, dat);
                fputs(scanl, stdout);
+       }
 
        /* return dynamically allocated buffers to pool */
        while ((cptr = *savecomp++)) {
@@ -296,7 +282,7 @@ finished:
        *--nxtbuf = tmpbuf;
 
        if (incing && (ferror(scnout) || fclose(scnout) == EOF))
-               adios(scnmsg, "write error on");
+               adios(EX_IOERR, scnmsg, "write error on");
 
        return (state != FILEEOF ? SCNERR : SCNMSG);
 }