No error-checking for error-checking alloc functions

[mmh] / uip / mhstore.c

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 63fa5ab..fae054f 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -15,6 +15,10 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define AUTOSW  0
@@ -130,7 +134,7 @@ main(int argc, char **argv)
        FILE *fp;
 
        if (atexit(freects_done) != 0) {
-               adios(NULL, "atexit failed");
+               adios(EX_OSERR, NULL, "atexit failed");
        }
 
        setlocale(LC_ALL, "");
@@ -150,17 +154,17 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               exit(1);
+                               exit(EX_USAGE);
                        case UNKWNSW:
-                               adios(NULL, "-%s unknown", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
 
                        case AUTOSW:
                                autosw++;
@@ -171,25 +175,25 @@ main(int argc, char **argv)
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (npart >= NPARTS)
-                                       adios(NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
+                                       adios(EX_USAGE, NULL, "too many parts (starting with %s), %d max", cp, NPARTS);
                                parts[npart++] = cp;
                                continue;
 
                        case TYPESW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                if (ntype >= NTYPES)
-                                       adios(NULL, "too many types (starting with %s), %d max", cp, NTYPES);
+                                       adios(EX_USAGE, NULL, "too many types (starting with %s), %d max", cp, NTYPES);
                                types[ntype++] = cp;
                                continue;
 
                        case FILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                file = *cp == '-' ? cp : getcpy(expanddir(cp));
                                continue;
@@ -201,7 +205,7 @@ main(int argc, char **argv)
                }
                if (*cp == '+' || *cp == '@') {
                        if (folder)
-                               adios(NULL, "only one folder at a time!");
+                               adios(EX_USAGE, NULL, "only one folder at a time!");
                        else
                                folder = getcpy(expandfol(cp));
                } else
@@ -251,14 +255,13 @@ main(int argc, char **argv)
                tmp = getcpy(toabsdir(invo_name));
 
        if (file && msgs.size)
-               adios(NULL, "cannot specify msg and file at same time!");
+               adios(EX_USAGE, NULL, "cannot specify msg and file at same time!");
 
        /*
        ** check if message is coming from file
        */
        if (file) {
-               if (!(cts = (CT *) calloc((size_t) 2, sizeof(*cts))))
-                       adios(NULL, "out of memory");
+               cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts));
                ctp = cts;
 
                if ((ct = parse_mime(file)))
@@ -274,25 +277,24 @@ main(int argc, char **argv)
                maildir = toabsdir(folder);
 
                if (chdir(maildir) == NOTOK)
-                       adios(maildir, "unable to change directory to");
+                       adios(EX_OSERR, maildir, "unable to change directory to");
 
                /* read folder and create message structure */
                if (!(mp = folder_read(folder)))
-                       adios(NULL, "unable to read folder %s", folder);
+                       adios(EX_IOERR, NULL, "unable to read folder %s", folder);
 
                /* check for empty folder */
                if (mp->nummsg == 0)
-                       adios(NULL, "no messages in %s", folder);
+                       adios(EX_DATAERR, NULL, "no messages in %s", folder);
 
                /* parse all the message ranges/sequences and set SELECTED */
                for (msgnum = 0; msgnum < msgs.size; msgnum++)
                        if (!m_convert(mp, msgs.msgs[msgnum]))
-                               exit(1);
+                               exit(EX_USAGE);
                seq_setprev(mp);  /* set the previous-sequence */
 
-               if (!(cts = (CT *) calloc((size_t) (mp->numsel + 1),
-                               sizeof(*cts))))
-                       adios(NULL, "out of memory");
+               cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
+                               sizeof(*cts));
                ctp = cts;
 
                for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -307,7 +309,7 @@ main(int argc, char **argv)
        }
 
        if (!*cts)
-               exit(1);
+               exit(EX_SOFTWARE);
 
        userrs = 1;
        SIGNAL(SIGQUIT, quitser);
@@ -360,9 +362,10 @@ pipeser(int i)
                fflush(stdout);
                fprintf(stderr, "\n");
                fflush(stderr);
+               exit(EX_TEMPFAIL);
        }
 
-       exit(1);
+       exit(EX_IOERR);
        /* NOTREACHED */
 }
 
@@ -452,7 +455,7 @@ store_switch(CT ct)
                break;
 
        default:
-               adios(NULL, "unknown content type %d", ct->c_type);
+               adios(EX_DATAERR, NULL, "unknown content type %d", ct->c_type);
                break;
        }
 
@@ -565,8 +568,7 @@ store_partial(CT ct)
                return NOTOK;
        }
 
-       if ((base = (CT *) calloc((size_t) (i + 1), sizeof(*base))) == NULL)
-               adios(NULL, "out of memory");
+       base = (CT *) mh_xcalloc((size_t) (i + 1), sizeof(*base));
 
        ctq = base;
        for (ctp = cts; *ctp; ctp++) {
@@ -645,12 +647,12 @@ store_external(CT ct)
                msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg);
        }
        if (!(fp = fopen(ct->c_file, "r"))) {
-               adios(ct->c_file, "unable to open");
+               adios(EX_IOERR, ct->c_file, "unable to open");
        }
        fseek(fp, ct->c_begin, SEEK_SET);
        while (!feof(fp) && ftell(fp) < ct->c_end) {
                if (!fgets(buf, sizeof buf, fp)) {
-                       adios(ct->c_file, "unable to read");
+                       adios(EX_IOERR, ct->c_file, "unable to read");
                }
                *strchr(buf, '\n') = '\0';
                msg = add(concat("\n\t", buf, NULL), msg);