X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=e31c6a627076197567c5ca671227096e08098da1;hp=6a756d9855f24302836557e3acc570bad53ab6a1;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=a7771fd2e83d64228fb675749fc936151249dbd3 diff --git a/uip/inc.c b/uip/inc.c index 6a756d9..e31c6a6 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -29,46 +29,53 @@ #include #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 { "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 }, }; +char *version=VERSION; + /* ** This is an attempt to simplify things by putting all the ** privilege ops into macros. @@ -99,8 +106,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 */ @@ -121,9 +136,7 @@ static FILE *in; /* ** prototypes */ -char *map_name(char *); - -static void inc_done(int) NORETURN; +void inc_done(); int @@ -137,9 +150,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; @@ -147,28 +160,22 @@ 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(); - mts_init(invo_name); arguments = getarguments(invo_name, argc, argv, 1); argp = arguments; @@ -177,22 +184,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; @@ -220,10 +227,10 @@ main(int argc, char **argv) continue; case FILESW: - if (!(cp = *argp++) || *cp == '-') - adios(NULL, "missing argument to %s", + if (!(cp = *argp++)) + adios(EX_USAGE, NULL, "missing argument to %s", argp[-2]); - from = getcpy(expanddir(cp)); + from = (strcmp(cp, "-")==0) ? "-" : mh_xstrdup(expanddir(cp)); /* ** If the truncate file is in default state, @@ -242,20 +249,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]); - format = NULL; - continue; - case FMTSW: - if (!(format = *argp++) || *format == '-') - adios(NULL, "missing argument to %s", - argp[-2]); - form = NULL; 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; @@ -263,11 +263,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); } } @@ -276,56 +276,51 @@ main(int argc, char **argv) ** NOTE: above this point you should use TRYDROPGROUPPRIVS(), ** not DROPGROUPPRIVS(). */ - /* guarantee dropping group priveleges; we might not have done so earlier */ + /* guarantee dropping group privileges; we might not have done so earlier */ DROPGROUPPRIVS(); - /* - ** We will get the mail from a file - ** (typically the standard maildrop) - */ - if (from) - newmail = from; - else if ((newmail = getenv("MAILDROP")) && *newmail) - newmail = toabsdir(newmail); - else if ((newmail = context_find("maildrop")) && *newmail) - newmail = toabsdir(newmail); - else { - newmail = concat(MAILDIR, "/", MAILFIL, NULL); - } - if (stat(newmail, &s1) == NOTOK || s1.st_size == 0) - adios(NULL, "no mail to incorporate"); + if (from && strcmp(from, "-")==0) { + /* We'll read mail from stdin. */ + newmail = NULL; + } else { + /* We'll read mail from a file. */ + if (from) + newmail = from; + else if ((newmail = getenv("MAILDROP")) && *newmail) + newmail = toabsdir(newmail); + else if ((newmail = context_find("maildrop")) && *newmail) + newmail = toabsdir(newmail); + else { + newmail = concat(mailspool, "/", getusername(), NULL); + } + if (stat(newmail, &s1) == NOTOK || s1.st_size == 0) + adios(EX_DATAERR, NULL, "no mail to incorporate"); - if ((cp = strdup(newmail)) == NULL) - adios(NULL, "error allocating memory to copy newmail"); + if ((cp = strdup(newmail)) == NULL) + adios(EX_OSERR, NULL, "error allocating memory to copy newmail"); - newmail = cp; + newmail = cp; + } if (!folder) folder = getdeffol(); 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"); - 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"); + 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) { + if (!newmail) { + trnflag = 0; + in = stdin; + } else if (access(newmail, W_OK) != NOTOK) { locked++; if (trnflag) { SIGNAL(SIGHUP, SIG_IGN); @@ -338,12 +333,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. */ @@ -354,40 +349,41 @@ 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 */ - nfs = new_fs(form, format, FORMAT); + /* Set format string */ + fmtstr = new_fs(form, scanformat); if (noisy) { printf("Incorporating new mail into %s...\n\n", folder); 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) */ - m_unknown(in); /* the MAGIC invocation... */ hghnum = msgnum = mp->hghmsg; for (;;) { /* @@ -401,8 +397,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; @@ -425,7 +422,6 @@ main(int argc, char **argv) break; case SCNMSG: - case SCNENC: /* ** Run the external program hook on the message. */ @@ -436,10 +432,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++; @@ -459,6 +451,8 @@ main(int argc, char **argv) */ break; } +giveup:; + mh_free0(&maildir_copy); if (incerr < 0) { /* error */ if (locked) { @@ -471,17 +465,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); @@ -497,9 +486,8 @@ main(int argc, char **argv) close(newfd); else admonish(newmail, "error zero'ing"); - unlink(map_name(newmail)); } - } else if (noisy) { + } else if (noisy && newmail) { printf("%s not zero'd\n", newmail); } @@ -527,20 +515,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); }