X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Finc.c;h=159e0108d112d7bd3b1e0a1acb5fbcf51cb5af85;hb=2823e13f67239db7deb7274f3a47bfbff56c7c64;hp=9e6fb6f0db321f46c611cc5e0d0fcf7d6e70ff1b;hpb=3d78b9c80a95f4e7885ed607018f9b1b9be559b4;p=mmh diff --git a/uip/inc.c b/uip/inc.c index 9e6fb6f..159e010 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -42,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 }, }; /* @@ -121,9 +119,7 @@ static FILE *in; /* ** prototypes */ -char *map_name(char *); - -static void inc_done(int) NORETURN; +static void inc_done(); int @@ -137,9 +133,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,11 +143,7 @@ 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; + atexit(inc_done); /* ** absolutely the first thing we do is save our privileges, @@ -160,15 +152,12 @@ main(int argc, char **argv) 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 +166,23 @@ 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 == '-') adios(NULL, "missing argument to %s", argp[-2]); - audfile = getcpy(m_maildir(cp)); + audfile = getcpy(expanddir(cp)); continue; case NAUDSW: audfile = NULL; @@ -223,7 +213,7 @@ main(int argc, char **argv) if (!(cp = *argp++) || *cp == '-') adios(NULL, "missing argument to %s", argp[-2]); - from = path(cp, TFILE); + from = getcpy(expanddir(cp)); /* ** If the truncate file is in default state, @@ -244,13 +234,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: @@ -265,7 +248,7 @@ main(int argc, char **argv) if (folder) adios(NULL, "only one folder at a time!"); else - folder = pluspath(cp); + folder = getcpy(expandfol(cp)); } else { adios(NULL, "usage: %s [+folder] [switches]", invo_name); @@ -286,37 +269,28 @@ main(int argc, char **argv) if (from) newmail = from; else if ((newmail = getenv("MAILDROP")) && *newmail) - newmail = m_mailpath(newmail); + newmail = toabsdir(newmail); else if ((newmail = context_find("maildrop")) && *newmail) - newmail = m_mailpath(newmail); + newmail = toabsdir(newmail); else { - newmail = concat(MAILDIR, "/", MAILFIL, NULL); + newmail = concat(mailspool, "/", getusername(), NULL); } if (stat(newmail, &s1) == NOTOK || s1.st_size == 0) adios(NULL, "no mail to incorporate"); - if ((cp = strdup(newmail)) == (char *)0) + if ((cp = strdup(newmail)) == NULL) adios(NULL, "error allocating memory to copy newmail"); newmail = cp; if (!folder) - folder = getfolder(FDEF); - maildir = m_maildir(folder); + folder = getdeffol(); + maildir = toabsdir(folder); - if ((maildir_copy = strdup(maildir)) == (char *)0) + 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, done); if (chdir(maildir) == NOTOK) adios(maildir, "unable to change directory to"); @@ -359,25 +333,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); @@ -387,7 +347,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 (;;) { /* @@ -401,8 +361,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,21 +386,16 @@ main(int argc, char **argv) break; case SCNMSG: - case SCNENC: /* ** Run the external program hook on the message. */ snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1); - ext_hook("add-hook", b, (char *)0); + ext_hook("add-hook", b, NULL); if (aud) fputs(scanl, aud); -#ifdef MHE - if (mhe) - fputs(scanl, mhe); -#endif /* MHE */ if (noisy) fflush(stdout); msgnum++; @@ -459,11 +415,12 @@ main(int argc, char **argv) */ break; } + free(maildir_copy); if (incerr < 0) { /* error */ if (locked) { GETGROUPPRIVS(); /* Be sure we can unlock mail file */ - (void) lkfclose(in, newmail); in = NULL; + lkfclose(in, newmail); in = NULL; DROPGROUPPRIVS(); /* ** And then return us to normal ** privileges @@ -477,11 +434,6 @@ main(int argc, char **argv) if (aud) fclose(aud); -#ifdef MHE - if (mhe) - fclose(mhe); -#endif /* MHE */ - if (noisy) fflush(stdout); @@ -497,7 +449,6 @@ main(int argc, char **argv) close(newfd); else admonish(newmail, "error zero'ing"); - unlink(map_name(newmail)); } } else if (noisy) { printf("%s not zero'd\n", newmail); @@ -506,7 +457,7 @@ main(int argc, char **argv) if (msgnum == hghnum) { admonish(NULL, "no messages incorporated"); } else { - context_replace(pfolder, folder); /* update current folder */ + context_replace(curfolder, folder); /* update current folder */ if (chgflag) mp->curmsg = hghnum + 1; mp->hghmsg = msgnum; @@ -521,26 +472,24 @@ main(int argc, char **argv) */ if (locked) { GETGROUPPRIVS(); /* Be sure we can unlock mail file */ - (void) lkfclose(in, newmail); in = NULL; + lkfclose(in, newmail); in = NULL; DROPGROUPPRIVS(); /* And then return us to normal privileges */ } else { fclose(in); in = NULL; } - seq_setunseen(mp, 0); /* set the Unseen-Sequence */ + 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) +inc_done() { if (locked) { GETGROUPPRIVS(); lkfclose(in, newmail); DROPGROUPPRIVS(); } - exit(status); }