X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=33672de6fdc27d8498ee7e2ce6c289934888d797;hb=0a96784b09f85f33437936b5dcfa819a33fa5bac;hp=587bd846df21b930424bd3d934a86545a46222c2;hpb=33dc8211a72df0c27fa11220f3b27583cd1c7e49;p=mmh diff --git a/uip/inc.c b/uip/inc.c index 587bd84..33672de 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -41,31 +41,30 @@ 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 { "form formatfile", 0 }, -#define FMTSW 6 - { "format string", 5 }, -#define SILSW 7 +#define SILSW 6 { "silent", 0 }, -#define NSILSW 8 - { "nosilent", 0 }, -#define TRNCSW 9 +#define NSILSW 7 + { "nosilent", 2 }, +#define TRNCSW 8 { "truncate", 0 }, -#define NTRNCSW 10 - { "notruncate", 0 }, -#define WIDTHSW 11 +#define NTRNCSW 9 + { "notruncate", 2 }, +#define WIDTHSW 10 { "width columns", 0 }, -#define VERSIONSW 12 - { "version", 0 }, -#define HELPSW 13 +#define VERSIONSW 11 + { "Version", 0 }, +#define HELPSW 12 { "help", 0 }, + { NULL, 0 }, }; /* @@ -98,8 +97,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 */ @@ -120,7 +127,7 @@ static FILE *in; /* ** prototypes */ -static void inc_done(int) NORETURN; +void inc_done(); int @@ -134,9 +141,9 @@ main(int argc, char **argv) ** not truncate mailspool */ char *cp, *maildir = NULL, *folder = NULL; - char *format = NULL, *form = NULL; + char *form = NULL; char *audfile = NULL, *from = NULL; - char buf[BUFSIZ], **argp, *nfs, **arguments; + char buf[BUFSIZ], **argp, *fmtstr, **arguments; struct msgs *mp = NULL; struct stat st, s1; FILE *aud = NULL; @@ -144,11 +151,9 @@ main(int argc, char **argv) /* copy of mail directory because the static gets overwritten */ char *maildir_copy = NULL; -#ifdef MHE - FILE *mhe = NULL; -#endif - - done=inc_done; + if (atexit(inc_done) != 0) { + adios(NULL, "atexit failed"); + } /* ** absolutely the first thing we do is save our privileges, @@ -157,9 +162,7 @@ main(int argc, char **argv) SAVEGROUPPRIVS(); TRYDROPGROUPPRIVS(); -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); /* read user profile/context */ @@ -173,17 +176,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 == '-') @@ -240,13 +244,6 @@ main(int argc, char **argv) if (!(form = *argp++) || *form == '-') adios(NULL, "missing argument to %s", argp[-2]); - format = NULL; - continue; - case FMTSW: - if (!(format = *argp++) || *format == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - form = NULL; continue; case WIDTHSW: @@ -303,16 +300,7 @@ main(int argc, char **argv) if ((maildir_copy = strdup(maildir)) == NULL) adios(maildir, "error allocating memory to copy maildir"); - if (!folder_exists(maildir)) { - /* - ** If the folder doesn't exist, and we're given the -silent - ** flag, just fail. - */ - if (noisy) - create_folder(maildir, 0, done); - else - done(1); - } + create_folder(maildir, noisy ? 0 : 1, exit); if (chdir(maildir) == NOTOK) adios(maildir, "unable to change directory to"); @@ -355,25 +343,11 @@ main(int argc, char **argv) chmod(audfile, m_gmprot()); fprintf(aud, from ? "<> %s -ms %s\n" : "<> %s\n", - dtimenow(0), from); + dtimenow(), from); } -#ifdef MHE - if (context_find("mhe")) { - int i; - cp = concat(maildir, "/++", NULL); - i = stat(cp, &st); - if ((mhe = fopen(cp, "a")) == NULL) - admonish(cp, "unable to append to"); - else - if (i == NOTOK) - chmod(cp, m_gmprot()); - free(cp); - } -#endif /* MHE */ - /* Get new format string */ - nfs = new_fs(form, format, FORMAT); + fmtstr = new_fs(form, FORMAT); if (noisy) { printf("Incorporating new mail into %s...\n\n", folder); @@ -383,7 +357,7 @@ main(int argc, char **argv) /* ** Get the mail from file (usually mail spool) */ - m_unknown(in); /* the MAGIC invocation... */ + thisisanmbox(in); hghnum = msgnum = mp->hghmsg; for (;;) { /* @@ -397,8 +371,9 @@ main(int argc, char **argv) } /* create scanline for new message */ - switch (incerr = scan(in, msgnum + 1, msgnum + 1, nfs, width, - msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) { + switch (incerr = scan(in, msgnum + 1, msgnum + 1, + noisy ? fmtstr : NULL, width, + msgnum == hghnum && chgflag, 1)) { case SCNFAT: case SCNEOF: break; @@ -421,7 +396,6 @@ main(int argc, char **argv) break; case SCNMSG: - case SCNENC: /* ** Run the external program hook on the message. */ @@ -432,10 +406,6 @@ main(int argc, char **argv) if (aud) fputs(scanl, aud); -#ifdef MHE - if (mhe) - fputs(scanl, mhe); -#endif /* MHE */ if (noisy) fflush(stdout); msgnum++; @@ -455,6 +425,7 @@ main(int argc, char **argv) */ break; } + free(maildir_copy); if (incerr < 0) { /* error */ if (locked) { @@ -473,11 +444,6 @@ main(int argc, char **argv) if (aud) fclose(aud); -#ifdef MHE - if (mhe) - fclose(mhe); -#endif /* MHE */ - if (noisy) fflush(stdout); @@ -525,17 +491,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); }