No error-checking for error-checking alloc functions

[mmh] / uip / scansbr.c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 56583f1..d985a5c 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -12,19 +12,15 @@
 #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,8 +70,6 @@ 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;
@@ -104,14 +98,10 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
                        datecomp = NULL;
                }
 
-               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;
@@ -149,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 */
@@ -251,7 +230,7 @@ body:;
                        goto finished;
 
                default:
-                       adios(NULL, "getfld() returned %d", state);
+                       adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
                }
        }
 
@@ -265,10 +244,10 @@ 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;
        }
 
@@ -280,9 +259,9 @@ finished:
                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 {
@@ -303,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);
 }