Fix uip/whom.c for C89 compatibility

[mmh] / uip / mhpath.c

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 47146f4..31e0722 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -10,6 +10,7 @@
 #include <h/utils.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define VERSIONSW 0
@@ -19,6 +20,8 @@ static struct swit switches[] = {
        { NULL, 0 }
 };
 
+char *version=VERSION;
+
 int
 main(int argc, char **argv)
 {
@@ -46,26 +49,28 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               exit(1); //sysexits.h EX_TEMPFAIL
+                               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); //sysexits.h EX_OK
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
-                               exit(0); //sysexits.h EX_OK
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        }
                }
                if (*cp == '+' || *cp == '@') {
-                       if (folder)
-                               adios(NULL, "only one folder at a time!");
-                       else
-                               folder = getcpy(expandfol(cp));
-               } else
+                       if (folder) {
+                               adios(EX_USAGE, NULL, "only one folder at a time!");
+                       } else {
+                               folder = mh_xstrdup(expandfol(cp));
+                       }
+               } else {
                        app_msgarg(&msgs, cp);
+               }
        }
 
        if (!folder)
@@ -75,15 +80,15 @@ main(int argc, char **argv)
        /* If no messages are given, print folder pathname */
        if (!msgs.size) {
                printf("%s\n", maildir);
-               exit(0); //sysexits.h EX_OK
+               exit(EX_OK);
        }
 
        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);
 
        /*
        ** We need to make sure there is message status space
@@ -92,15 +97,17 @@ main(int argc, char **argv)
        ** space at the end, we go ahead and add 10 slots.
        */
        if (mp->hghmsg >= mp->hghoff) {
-               if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10)))
-                       adios(NULL, "unable to allocate folder storage");
+               if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10))) {
+                       adios(EX_OSERR, NULL, "unable to allocate folder storage");
+               }
        } else if (mp->lowoff > 1) {
-               if (!(mp = folder_realloc(mp, 1, mp->hghoff)))
-                       adios(NULL, "unable to allocate folder storage");
+               if (!(mp = folder_realloc(mp, 1, mp->hghoff))) {
+                       adios(EX_OSERR, NULL, "unable to allocate folder storage");
+               }
        }
        /*
        ** TODO: As folder_realloc() checks itself if the realloc
-       ** really is necesary, why don't we then:
+       ** really is necessary, why don't we then:
        **    if (!(mp = folder_realloc (mp, 1, mp->hghmsg+1)))
        **        adios (NULL, "unable to allocate folder storage");
        ** ? This at least appears most clear to me. -- meillo
@@ -112,7 +119,7 @@ main(int argc, char **argv)
        /* parse all the message ranges/sequences and set SELECTED */
        for (i = 0; i < msgs.size; i++) {
                if (!m_convert(mp, msgs.msgs[i])) {
-                       exit(1); //sysexits.h EX_USAGE
+                       exit(EX_SOFTWARE);
                }
        }
 
@@ -126,5 +133,5 @@ main(int argc, char **argv)
        seq_save(mp);  /* synchronize message sequences */
        context_save();  /* save the context file */
        folder_free(mp);  /* free folder/message structure */
-       return 0;
+       return EX_OK;
 }