Replace getcpy() and strdup() with mh_xstrdup()

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 33672de..1523a2c 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -29,13 +29,20 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <fcntl.h>
-
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <errno.h>
 #include <signal.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 static struct swit switches[] = {
 #define AUDSW  0
@@ -100,12 +107,12 @@ static int return_gid;
 #define DROPGROUPPRIVS() \
     if (setegid(getgid()) != 0) { \
         advise ("setegid", "unable to set group to %ld", (long) getgid()); \
-               _exit (-1); \
+               _exit (EX_OSERR); \
     }
 #define GETGROUPPRIVS() \
     if (setegid(return_gid) != 0) { \
         advise ("setegid", "unable to set group to %ld", (long) return_gid); \
-               _exit (-1); \
+               _exit (EX_OSERR); \
     }
 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
@@ -152,7 +159,7 @@ main(int argc, char **argv)
        char *maildir_copy = NULL;
 
        if (atexit(inc_done) != 0) {
-               adios(NULL, "atexit failed");
+               adios(EX_OSERR, NULL, "atexit failed");
        }
 
 /*
@@ -176,23 +183,22 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               /* sysexits.h EX_USAGE */
-                               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] [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 AUDSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s", argp[-2]);
-                               audfile = getcpy(expanddir(cp));
+                                       adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]);
+                               audfile = mh_xstrdup(expanddir(cp));
                                continue;
                        case NAUDSW:
                                audfile = NULL;
@@ -221,9 +227,9 @@ main(int argc, char **argv)
 
                        case FILESW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
-                               from = getcpy(expanddir(cp));
+                               from = mh_xstrdup(expanddir(cp));
 
                                /*
                                ** If the truncate file is in default state,
@@ -242,13 +248,13 @@ main(int argc, char **argv)
 
                        case FORMSW:
                                if (!(form = *argp++) || *form == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;
 
                        case WIDTHSW:
                                if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                width = atoi(cp);
                                continue;
@@ -256,11 +262,11 @@ 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));
+                               folder = mh_xstrdup(expandfol(cp));
                } else {
-                       adios(NULL, "usage: %s [+folder] [switches]",
+                       adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]",
                                        invo_name);
                }
        }
@@ -286,10 +292,10 @@ main(int argc, char **argv)
                newmail = concat(mailspool, "/", getusername(), NULL);
        }
        if (stat(newmail, &s1) == NOTOK || s1.st_size == 0)
-               adios(NULL, "no mail to incorporate");
+               adios(EX_DATAERR, NULL, "no mail to incorporate");
 
        if ((cp = strdup(newmail)) == NULL)
-               adios(NULL, "error allocating memory to copy newmail");
+               adios(EX_OSERR, NULL, "error allocating memory to copy newmail");
 
        newmail = cp;
 
@@ -298,16 +304,16 @@ main(int argc, char **argv)
        maildir = toabsdir(folder);
 
        if ((maildir_copy = strdup(maildir)) == NULL)
-               adios(maildir, "error allocating memory to copy maildir");
+               adios(EX_OSERR, maildir, "error allocating memory to copy maildir");
 
        create_folder(maildir, noisy ? 0 : 1, exit);
 
        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);
 
        if (access(newmail, W_OK) != NOTOK) {
                locked++;
@@ -322,12 +328,12 @@ main(int argc, char **argv)
                in = lkfopen(newmail, "r");
                DROPGROUPPRIVS();
                if (in == NULL)
-                       adios(NULL, "unable to lock and fopen %s", newmail);
+                       adios(EX_IOERR, NULL, "unable to lock and fopen %s", newmail);
                fstat(fileno(in), &s1);
        } else {
                trnflag = 0;
                if ((in = fopen(newmail, "r")) == NULL)
-                       adios(newmail, "unable to read");
+                       adios(EX_IOERR, newmail, "unable to read");
        }
 
        /* This shouldn't be necessary but it can't hurt. */
@@ -338,7 +344,7 @@ main(int argc, char **argv)
                if ((i = stat(audfile, &st)) == NOTOK)
                        advise(NULL, "Creating Receive-Audit: %s", audfile);
                if ((aud = fopen(audfile, "a")) == NULL)
-                       adios(audfile, "unable to append to");
+                       adios(EX_IOERR, audfile, "unable to append to");
                else if (i == NOTOK)
                        chmod(audfile, m_gmprot());
 
@@ -425,7 +431,7 @@ main(int argc, char **argv)
                */
                break;
        }
-       free(maildir_copy);
+       mh_free0(&maildir_copy);
 
        if (incerr < 0) {  /* error */
                if (locked) {
@@ -438,7 +444,7 @@ main(int argc, char **argv)
                } else {
                        fclose(in); in = NULL;
                }
-               adios(NULL, "failed");
+               adios(EX_SOFTWARE, NULL, "failed");
        }
 
        if (aud)