X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=5f08df4598ffb3e047714b3582e66e2eec42c4f1;hp=98fffef1be34bbe69bdfd22b0be8881313ec373d;hb=28ce2e7139731b7c8c0bdb67b181f34011e74ed7;hpb=611d68d19204d7cbf5bd585391249cb5bafca846 diff --git a/uip/inc.c b/uip/inc.c index 98fffef..5f08df4 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -29,23 +29,30 @@ #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 { "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,17 +60,18 @@ 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 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 12 { "help", 0 }, + { NULL, 0 }, }; /* @@ -96,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 */ @@ -118,7 +134,7 @@ static FILE *in; /* ** prototypes */ -static void inc_done(int) NORETURN; +void inc_done(); int @@ -142,25 +158,20 @@ 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(EX_OSERR, NULL, "atexit failed"); + } -/* -** absolutely the first thing we do is save our privileges, -** and drop them if we can. -*/ + /* + ** absolutely the first thing we do is save our privileges, + ** and drop them if we can. + */ SAVEGROUPPRIVS(); TRYDROPGROUPPRIVS(); -#ifdef LOCALE setlocale(LC_ALL, ""); -#endif invo_name = mhbasename(argv[0]); - /* read user profile/context */ context_read(); arguments = getarguments(invo_name, argc, argv, 1); @@ -171,21 +182,21 @@ 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]); + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); audfile = getcpy(expanddir(cp)); continue; case NAUDSW: @@ -215,7 +226,7 @@ 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)); @@ -236,13 +247,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; @@ -250,11 +261,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)); } else { - adios(NULL, "usage: %s [+folder] [switches]", + adios(EX_USAGE, NULL, "usage: %s [+folder] [switches]", invo_name); } } @@ -280,10 +291,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; @@ -292,16 +303,15 @@ 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++; @@ -316,12 +326,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. */ @@ -332,28 +342,14 @@ 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()); 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 */ fmtstr = new_fs(form, FORMAT); @@ -362,10 +358,25 @@ main(int argc, char **argv) fflush(stdout); } + /* check if readable and nonempty */ + if (!fgets(buf, sizeof(buf), in)) { + if (ferror(in)) { + advise("read", "unable to"); + incerr = SCNFAT; + } else { + incerr = SCNEOF; + } + goto giveup; + } + if (strncmp("From ", buf, 5)!=0) { + advise(NULL, "not in mbox format"); + incerr = SCNFAT; + goto giveup; + } + /* ** Get the mail from file (usually mail spool) */ - thisisanmbox(in); hghnum = msgnum = mp->hghmsg; for (;;) { /* @@ -414,10 +425,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++; @@ -437,6 +444,8 @@ main(int argc, char **argv) */ break; } +giveup:; + free(maildir_copy); if (incerr < 0) { /* error */ if (locked) { @@ -449,17 +458,12 @@ main(int argc, char **argv) } else { fclose(in); in = NULL; } - adios(NULL, "failed"); + adios(EX_SOFTWARE, NULL, "failed"); } if (aud) fclose(aud); -#ifdef MHE - if (mhe) - fclose(mhe); -#endif /* MHE */ - if (noisy) fflush(stdout); @@ -504,20 +508,18 @@ main(int argc, char **argv) fclose(in); in = NULL; } - 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; + seq_setunseen(mp, 1); + seq_save(mp); + context_save(); + return 0; } -static void -inc_done(int status) +void +inc_done() { if (locked) { GETGROUPPRIVS(); lkfclose(in, newmail); DROPGROUPPRIVS(); } - exit(status); }