No error-checking for error-checking alloc functions
[mmh] / uip / mhtest.c
index 37174de..dd45626 100644 (file)
@@ -9,61 +9,43 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
-#include <h/mhcachesbr.h>
 #include <h/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
-#define CHECKSW  0
-       { "check", 0 },
-#define NCHECKSW  1
-       { "nocheck", 0 },
-#define VERBSW  2
+#define VERBSW  0
        { "verbose", 0 },
-#define NVERBSW  3
-       { "noverbose", 0 },
-#define FILESW  4
+#define NVERBSW  1
+       { "noverbose", 2 },
+#define FILESW  2
        { "file file", 0 },
-#define OUTFILESW  5
+#define OUTFILESW  3
        { "outfile file", 0 },
-#define PARTSW  6
+#define PARTSW  4
        { "part number", 0 },
-#define TYPESW  7
+#define TYPESW  5
        { "type content", 0 },
-#define RCACHESW  8
-       { "rcache policy", 0 },
-#define WCACHESW  9
-       { "wcache policy", 0 },
-#define VERSIONSW  10
-       { "version", 0 },
-#define HELPSW  11
+#define VERSIONSW  6
+       { "Version", 0 },
+#define HELPSW  7
        { "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  12
+#define DEBUGSW  8
        { "debug", -5 },
        { NULL, 0 }
 };
 
 
-int ebcdicsw = 0;  /* hack for linking purposes */
-
 /* mhparse.c */
 extern char *tmp;  /* directory to place temp files */
 
-/* mhcachesbr.c */
-extern int rcachesw;
-extern int wcachesw;
-extern char *cache_public;
-extern char *cache_private;
-
 /* mhmisc.c */
 extern int npart;
 extern int ntype;
@@ -97,7 +79,7 @@ void flush_errors(void);
 /* mhfree.c */
 void free_content(CT);
 extern CT *cts;
-void freects_done(int) NORETURN;
+void freects_done();
 
 /*
 ** static prototypes
@@ -109,7 +91,7 @@ static void pipeser(int);
 int
 main(int argc, char **argv)
 {
-       int msgnum, *icachesw;
+       int msgnum;
        char *cp, *file = NULL, *folder = NULL;
        char *maildir, buf[100], *outfile = NULL;
        char **argp, **arguments;
@@ -117,11 +99,11 @@ main(int argc, char **argv)
        struct msgs *mp = NULL;
        CT ct, *ctp;
 
-       done=freects_done;
+       if (atexit(freects_done) != 0) {
+               adios(EX_OSERR, NULL, "atexit failed");
+       }
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -138,72 +120,45 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(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);
-                               done(1);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
-
-                       case RCACHESW:
-                               icachesw = &rcachesw;
-                               goto do_cache;
-                       case WCACHESW:
-                               icachesw = &wcachesw;
-do_cache:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               switch (*icachesw = smatch(cp, caches)) {
-                               case AMBIGSW:
-                                       ambigsw(cp, caches);
-                                       done(1);
-                               case UNKWNSW:
-                                       adios(NULL, "%s unknown", cp);
-                               default:
-                                       break;
-                               }
-                               continue;
-
-                       case CHECKSW:
-                               checksw++;
-                               continue;
-                       case NCHECKSW:
-                               checksw = 0;
-                               continue;
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
 
                        case PARTSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
+                                       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", argp[-2]);
+                                       adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
                                if (ntype >= NTYPES)
-                                       adios(NULL, "too many types (starting with %s), %d max",
+                                       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;
 
                        case OUTFILESW:
                                if (!(cp = *argp++) || (*cp == '-' && cp[1]))
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                outfile = *cp == '-' ? cp : getcpy(expanddir(cp));
                                continue;
@@ -221,7 +176,7 @@ do_cache:
                }
                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
@@ -235,16 +190,7 @@ do_cache:
        set_endian();
 
        if (outfile == NULL)
-               adios(NULL, "must specify output file");
-
-       /* Check for public cache location */
-       if ((cache_public = context_find(nmhcache)) && *cache_public != '/')
-               cache_public = NULL;
-
-       /* Check for private cache location */
-       if (!(cache_private = context_find(nmhprivcache)))
-               cache_private = ".cache";
-       cache_private = getcpy(toabsdir(cache_private));
+               adios(EX_USAGE, NULL, "must specify output file");
 
        /*
        ** Check for storage directory.  If specified,
@@ -257,14 +203,13 @@ do_cache:
                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)))
@@ -280,25 +225,24 @@ do_cache:
                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]))
-                               done(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++) {
@@ -313,7 +257,7 @@ do_cache:
        }
 
        if (!*cts)
-               done(1);
+               exit(EX_SOFTWARE);
 
        userrs = 1;
        SIGNAL(SIGQUIT, quitser);
@@ -354,8 +298,7 @@ do_cache:
                context_save();  /* save the context file  */
        }
 
-       done(0);
-       return 1;
+       return EX_OK;
 }
 
 
@@ -384,6 +327,6 @@ pipeser(int i)
                fflush(stderr);
        }
 
-       done(1);
+       exit(EX_IOERR);
        /* NOTREACHED */
 }