X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=36e0ab1a89a3fc1106f6927984f9bc837f05b88b;hp=f737d698bf48ec8eb5484ef63a52ef81203fc372;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=ccf4f175ef4c4e7522f9510a4a1149c15d810dd9 diff --git a/uip/inc.c b/uip/inc.c index f737d69..36e0ab1 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -29,13 +29,20 @@ #include #include #include - #include #include #include #include #include #include +#include +#include +#include +#include + +#ifdef HAVE_SYS_PARAM_H +# include +#endif static struct swit switches[] = { #define AUDSW 0 @@ -97,8 +104,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 (EX_OSERR); \ + } +#define GETGROUPPRIVS() \ + if (setegid(return_gid) != 0) { \ + advise ("setegid", "unable to set group to %ld", (long) return_gid); \ + _exit (EX_OSERR); \ + } #define SAVEGROUPPRIVS() return_gid = getegid() #else /* define *GROUPPRIVS() as null; this avoids having lots of "#ifdef MAILGROUP"s */ @@ -119,7 +134,7 @@ static FILE *in; /* ** prototypes */ -static void inc_done(int) NORETURN; +void inc_done(); int @@ -143,7 +158,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(EX_OSERR, NULL, "atexit failed"); + } /* ** absolutely the first thing we do is save our privileges, @@ -166,22 +183,22 @@ 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] [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); + 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; @@ -210,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, @@ -231,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; @@ -245,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); } } @@ -275,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; @@ -287,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, done); + 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++; @@ -311,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. */ @@ -327,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()); @@ -335,8 +352,8 @@ main(int argc, char **argv) dtimenow(), from); } - /* Get new format string */ - fmtstr = new_fs(form, FORMAT); + /* Set format string */ + fmtstr = new_fs(form, scanformat); if (noisy) { printf("Incorporating new mail into %s...\n\n", folder); @@ -414,7 +431,7 @@ main(int argc, char **argv) */ break; } - free(maildir_copy); + mh_free0(&maildir_copy); if (incerr < 0) { /* error */ if (locked) { @@ -427,7 +444,7 @@ main(int argc, char **argv) } else { fclose(in); in = NULL; } - adios(NULL, "failed"); + adios(EX_SOFTWARE, NULL, "failed"); } if (aud) @@ -480,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); }