X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Finc.c;h=5f08df4598ffb3e047714b3582e66e2eec42c4f1;hp=33672de6fdc27d8498ee7e2ce6c289934888d797;hb=28ce2e7139731b7c8c0bdb67b181f34011e74ed7;hpb=0a96784b09f85f33437936b5dcfa819a33fa5bac diff --git a/uip/inc.c b/uip/inc.c index 33672de..5f08df4 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 @@ -100,12 +107,12 @@ static int return_gid; #define DROPGROUPPRIVS() \ if (setegid(getgid()) != 0) { \ advise ("setegid", "unable to set group to %ld", (long) getgid()); \ - _exit (-1); \ + _exit (EX_OSERR); \ } #define GETGROUPPRIVS() \ if (setegid(return_gid) != 0) { \ advise ("setegid", "unable to set group to %ld", (long) return_gid); \ - _exit (-1); \ + _exit (EX_OSERR); \ } #define SAVEGROUPPRIVS() return_gid = getegid() #else @@ -152,20 +159,19 @@ main(int argc, char **argv) char *maildir_copy = NULL; if (atexit(inc_done) != 0) { - adios(NULL, "atexit failed"); + 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(); setlocale(LC_ALL, ""); invo_name = mhbasename(argv[0]); - /* read user profile/context */ context_read(); arguments = getarguments(invo_name, argc, argv, 1); @@ -176,22 +182,21 @@ main(int argc, char **argv) switch (smatch(++cp, switches)) { case AMBIGSW: ambigsw(cp, switches); - /* sysexits.h EX_USAGE */ - exit(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); - exit(0); + exit(argc == 2 ? EX_OK : EX_USAGE); case VERSIONSW: print_version(invo_name); - exit(0); + 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: @@ -221,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)); @@ -242,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; @@ -256,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); } } @@ -286,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; @@ -298,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, 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++; @@ -322,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. */ @@ -338,7 +342,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()); @@ -354,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 (;;) { /* @@ -425,6 +444,7 @@ main(int argc, char **argv) */ break; } +giveup:; free(maildir_copy); if (incerr < 0) { /* error */ @@ -438,7 +458,7 @@ main(int argc, char **argv) } else { fclose(in); in = NULL; } - adios(NULL, "failed"); + adios(EX_SOFTWARE, NULL, "failed"); } if (aud) @@ -488,9 +508,9 @@ 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 */ + seq_setunseen(mp, 1); + seq_save(mp); + context_save(); return 0; }