Move #include from h/mh.h to source files

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index e155784..1cac19f 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -29,23 +29,29 @@
 #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>
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 
 static struct swit switches[] = {
 #define AUDSW  0
        { "audit audit-file", 0 },
 #define NAUDSW  1
-       { "noaudit", 0 },
+       { "noaudit", 2 },
 #define CHGSW  2
        { "changecur", 0 },
 #define NCHGSW  3
-       { "nochangecur", 0 },
+       { "nochangecur", 2 },
 #define FILESW  4
        { "file name", 0 },
 #define FORMSW  5
@@ -53,11 +59,11 @@ static struct swit switches[] = {
 #define SILSW  6
        { "silent", 0 },
 #define NSILSW  7
-       { "nosilent", 0 },
+       { "nosilent", 2 },
 #define TRNCSW  8
        { "truncate", 0 },
 #define NTRNCSW  9
-       { "notruncate", 0 },
+       { "notruncate", 2 },
 #define WIDTHSW  10
        { "width columns", 0 },
 #define VERSIONSW  11
@@ -97,8 +103,16 @@ static int return_gid;
 ** easy case; we're not setuid root, so can drop group privs immediately.
 */
 #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS()
-#define DROPGROUPPRIVS() setgid(getgid())
-#define GETGROUPPRIVS() setgid(return_gid)
+#define DROPGROUPPRIVS() \
+    if (setegid(getgid()) != 0) { \
+        advise ("setegid", "unable to set group to %ld", (long) getgid()); \
+               _exit (-1); \
+    }
+#define GETGROUPPRIVS() \
+    if (setegid(return_gid) != 0) { \
+        advise ("setegid", "unable to set group to %ld", (long) return_gid); \
+               _exit (-1); \
+    }
 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
 /* define *GROUPPRIVS() as null; this avoids having lots of "#ifdef MAILGROUP"s */
@@ -119,7 +133,7 @@ static FILE *in;
 /*
 ** prototypes
 */
-static void inc_done(int) NORETURN;
+void inc_done();
 
 
 int
@@ -143,7 +157,9 @@ main(int argc, char **argv)
        /* copy of mail directory because the static gets overwritten */
        char *maildir_copy = NULL;
 
-       done=inc_done;
+       if (atexit(inc_done) != 0) {
+               adios(NULL, "atexit failed");
+       }
 
 /*
 ** absolutely the first thing we do is save our privileges,
@@ -152,9 +168,7 @@ main(int argc, char **argv)
        SAVEGROUPPRIVS();
        TRYDROPGROUPPRIVS();
 
-#ifdef LOCALE
        setlocale(LC_ALL, "");
-#endif
        invo_name = mhbasename(argv[0]);
 
        /* read user profile/context */
@@ -168,17 +182,18 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               done(1);
+                               /* sysexits.h EX_USAGE */
+                               exit(1);
                        case UNKWNSW:
                                adios(NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                                print_help(buf, switches, 1);
-                               done(1);
+                               exit(0);
                        case VERSIONSW:
                                print_version(invo_name);
-                               done(1);
+                               exit(0);
 
                        case AUDSW:
                                if (!(cp = *argp++) || *cp == '-')
@@ -291,7 +306,7 @@ main(int argc, char **argv)
        if ((maildir_copy = strdup(maildir)) == NULL)
                adios(maildir, "error allocating memory to copy maildir");
 
-       create_folder(maildir, noisy ? 0 : 1, done);
+       create_folder(maildir, noisy ? 0 : 1, exit);
 
        if (chdir(maildir) == NOTOK)
                adios(maildir, "unable to change directory to");
@@ -482,17 +497,15 @@ main(int argc, char **argv)
        seq_setunseen(mp, 1);  /* add new msgs to unseen sequences */
        seq_save(mp);  /* synchronize sequences   */
        context_save();  /* save the context file   */
-       done(0);
-       return 1;
+       return 0;
 }
 
-static void
-inc_done(int status)
+void
+inc_done()
 {
        if (locked) {
                GETGROUPPRIVS();
                lkfclose(in, newmail);
                DROPGROUPPRIVS();
        }
-       exit(status);
 }