#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
#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
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 12
{ "help", 0 },
{ NULL, 0 },
** 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 */
/*
** prototypes
*/
-static void inc_done(int) NORETURN;
+void inc_done();
int
/* 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,
SAVEGROUPPRIVS();
TRYDROPGROUPPRIVS();
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
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 == '-')
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");
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);
}