X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..8699f1cc:/uip/inc.c?ds=sidebyside diff --git a/uip/inc.c b/uip/inc.c index 8650b8b0..e824ea37 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -40,6 +40,10 @@ #include #include #include +#include "h/done.h" +#include "sbr/lock_file.h" +#include "sbr/m_maildir.h" +#include "sbr/m_mktemp.h" #ifndef TLS_SUPPORT # define TLSminc(a) (a) @@ -57,8 +61,6 @@ X("format string", 5, FMTSW) \ X("host hostname", 0, HOSTSW) \ X("user username", 0, USERSW) \ - X("pack file", 0, PACKSW) \ - X("nopack", 0, NPACKSW) \ X("port name/number", 0, PORTSW) \ X("silent", 0, SILSW) \ X("nosilent", 0, NSILSW) \ @@ -92,7 +94,6 @@ DEFINE_SWITCH_ARRAY(INC, switches); #define INC_FILE 0 #define INC_POP 1 -static int inc_type; static struct Maildir_entry { char *filename; time_t mtime; @@ -100,19 +101,12 @@ static struct Maildir_entry { static int num_maildir_entries = 0; static int snoop = 0; -extern char response[]; - -static int size; -static long pos; - -static int mbx_style = MMDF_FORMAT; -static int pd = NOTOK; - -static long start; -static long stop; +typedef struct { + FILE *mailout; + long written; +} pop_closure; -static char *packfile = NULL; -static FILE *pf = NULL; +extern char response[]; /* This is an attempt to simplify things by putting all the * privilege ops into macros. @@ -156,21 +150,18 @@ static gid_t return_gid; #endif /* not MAILGROUP */ /* these variables have to be globals so that done() can correctly clean up the lockfile */ -static int locked = 0; +static bool locked; static char *newmail; static FILE *in; /* * prototypes */ -char *map_name(char *); - +static int maildir_srt(const void *va, const void *vb) PURE; static void inc_done(int) NORETURN; -static int pop_action(char *); -static int pop_pack(char *); -static int map_count(void); +static int pop_action(void *closure, char *); -int +static int maildir_srt(const void *va, const void *vb) { const struct Maildir_entry *a = va, *b = vb; @@ -184,10 +175,14 @@ maildir_srt(const void *va, const void *vb) int main (int argc, char **argv) { - int chgflag = 1, trnflag = 1; - int noisy = 1, width = -1; + static int inc_type; + bool chgflag; + int trnflag = 1; + bool noisy; + int width = -1; int hghnum = 0, msgnum = 0; - int sasl = 0, tls = 0, noverify = 1; + FILE *pf = NULL; + bool sasl, tls, noverify; int incerr = 0; /* <0 if inc hits an error which means it should not truncate mailspool */ char *cp, *maildir = NULL, *folder = NULL; char *format = NULL, *form = NULL; @@ -202,7 +197,7 @@ main (int argc, char **argv) int nmsgs, nbytes; char *MAILHOST_env_variable; - done=inc_done; + set_done(inc_done); /* absolutely the first thing we do is save our privileges, * and drop them if we can. @@ -232,6 +227,8 @@ main (int argc, char **argv) if (pophost && *pophost) host = pophost; + sasl = tls = false; + chgflag = noisy = noverify = true; while ((cp = *argp++)) { if (*cp == '-') { switch (smatch (++cp, switches)) { @@ -259,10 +256,10 @@ main (int argc, char **argv) continue; case CHGSW: - chgflag++; + chgflag = true; continue; case NCHGSW: - chgflag = 0; + chgflag = false; continue; /* @@ -293,10 +290,10 @@ main (int argc, char **argv) continue; case SILSW: - noisy = 0; + noisy = false; continue; case NSILSW: - noisy++; + noisy = true; continue; case FORMSW: @@ -331,23 +328,15 @@ main (int argc, char **argv) adios (NULL, "missing argument to %s", argp[-2]); continue; - case PACKSW: - if (!(packfile = *argp++) || *packfile == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case NPACKSW: - packfile = NULL; - continue; - case SNOOPSW: snoop++; continue; case SASLSW: - sasl++; + sasl = true; continue; case NOSASLSW: - sasl = 0; + sasl = false; continue; case SASLMECHSW: @@ -356,19 +345,19 @@ main (int argc, char **argv) continue; case INITTLSSW: - tls++; + tls = true; continue; case NOTLSSW: - tls = 0; + tls = false; continue; case CERTVERSW: - noverify = 0; + noverify = false; continue; case NOCERTVERSW: - noverify++; + noverify = true; continue; case AUTHSERVICESW: @@ -389,8 +378,7 @@ main (int argc, char **argv) if (*cp == '+' || *cp == '@') { if (folder) adios (NULL, "only one folder at a time!"); - else - folder = pluspath (cp); + folder = pluspath (cp); } else { adios (NULL, "usage: %s [+folder] [switches]", invo_name); } @@ -402,24 +390,14 @@ main (int argc, char **argv) if (host && !*host) host = NULL; - /* guarantee dropping group priveleges; we might not have done so earlier */ + /* guarantee dropping group privileges; we might not have done so earlier */ DROPGROUPPRIVS(); - /* - * Where are we getting the new mail? - */ - if (from) - inc_type = INC_FILE; - else if (host) - inc_type = INC_POP; - else - inc_type = INC_FILE; + /* Source of mail; -from overrides any -host. */ + inc_type = host && !from ? INC_POP : INC_FILE; - /* - * Are we getting the mail from - * a POP server? - */ if (inc_type == INC_POP) { + /* Mail from a POP server. */ int tlsflag = 0; if (auth_svc == NULL) { @@ -453,14 +431,9 @@ main (int argc, char **argv) pop_quit(); adios (NULL, "no mail to incorporate"); } - } - - /* - * We will get the mail from a file - * (typically the standard maildrop) - */ - if (inc_type == INC_FILE) { + } else if (inc_type == INC_FILE) { + /* Mail from a spool file, or Maildir. */ if (from) newmail = from; else if ((newmail = getenv ("MAILDROP")) && *newmail) @@ -526,10 +499,6 @@ main (int argc, char **argv) newmail = cp; } - /* skip the folder setup */ - if ((inc_type == INC_POP) && packfile) - goto go_to_it; - if (!context_find ("path")) free (path ("./", TFOLDER)); if (!folder) @@ -554,11 +523,11 @@ main (int argc, char **argv) if (!(mp = folder_read (folder, 0))) adios (NULL, "unable to read folder %s", folder); -go_to_it: - if (inc_type == INC_FILE && Maildir == NULL) { + /* Mail from a spool file. */ + if (access (newmail, W_OK) != NOTOK) { - locked++; + locked = true; if (trnflag) { SIGNAL (SIGHUP, SIG_IGN); SIGNAL (SIGINT, SIG_IGN); @@ -588,7 +557,7 @@ go_to_it: inform("Creating Receive-Audit: %s", audfile); if ((aud = fopen (audfile, "a")) == NULL) adios (audfile, "unable to append to"); - else if (i == NOTOK) + if (i == NOTOK) chmod (audfile, m_gmprot ()); if (from) @@ -615,76 +584,40 @@ go_to_it: * Get the mail from a POP server */ if (inc_type == INC_POP) { + /* Mail from a POP server. */ int i; - if (packfile) { - packfile = path (packfile, TFILE); - if (stat (packfile, &st) == NOTOK) { - if (errno != ENOENT) - adios (packfile, "error on file"); - cp = concat ("Create file \"", packfile, "\"? ", NULL); - if (noisy && !read_yes_or_no_if_tty (cp)) - done (1); - free (cp); - } - msgnum = map_count (); - if ((pd = mbx_open (packfile, mbx_style, getuid(), getgid(), m_gmprot())) - == NOTOK) - adios (packfile, "unable to open"); - if ((pf = fdopen (pd, "w+")) == NULL) - adios (NULL, "unable to fdopen %s", packfile); - } else { - hghnum = msgnum = mp->hghmsg; - } + pop_closure pc; + hghnum = msgnum = mp->hghmsg; for (i = 1; i <= nmsgs; i++) { charstring_t scanl = NULL; msgnum++; - if (packfile) { - size_t len; - - fseek (pf, 0L, SEEK_CUR); - pos = ftell (pf); - size = 0; - len = strlen(mmdlm1); - if (fwrite(mmdlm1, 1, len, pf) < len) - advise (mmdlm1, "fwrite"); - start = ftell (pf); - - if (pop_retr (i, pop_pack) == NOTOK) - adios (NULL, "%s", response); - - fseek (pf, 0L, SEEK_CUR); - stop = ftell (pf); - if (fflush (pf)) - adios (packfile, "write error on"); - fseek (pf, start, SEEK_SET); - } else { - cp = mh_xstrdup(m_name (msgnum)); - if ((pf = fopen (cp, "w+")) == NULL) - adios (cp, "unable to write"); - chmod (cp, m_gmprot ()); - start = stop = 0L; - - if (pop_retr (i, pop_action) == NOTOK) - adios (NULL, "%s", response); - - if (fflush (pf)) - adios (cp, "write error on"); - fseek (pf, 0L, SEEK_SET); - } + cp = mh_xstrdup(m_name (msgnum)); + if ((pf = fopen (cp, "w+")) == NULL) + adios (cp, "unable to write"); + chmod (cp, m_gmprot ()); + + pc.written = 0; + pc.mailout = pf; + if (pop_retr(i, pop_action, &pc) == NOTOK) + adios (NULL, "%s", response); + + if (fflush (pf)) + adios (cp, "write error on"); + fseek (pf, 0L, SEEK_SET); switch (incerr = scan (pf, msgnum, 0, nfs, width, - packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag, - 1, NULL, stop - start, noisy, &scanl)) { + msgnum == mp->hghmsg + 1 && chgflag, + 1, NULL, pc.written, noisy, &scanl)) { case SCNEOF: printf ("%*d empty\n", DMAXFOLDER, msgnum); break; case SCNFAT: trnflag = 0; - noisy++; + noisy = true; /* advise (cp, "unable to read"); already advised */ - /* FALLTHRU */ + break; case SCNERR: case SCNNUM: @@ -701,30 +634,14 @@ go_to_it: } charstring_free (scanl); - if (packfile) { - size_t len; - - fseek (pf, stop, SEEK_SET); - len = strlen(mmdlm2); - if (fwrite(mmdlm2, 1, len, pf) < len) - advise (mmdlm2, "fwrite"); - if (fflush (pf) || ferror (pf)) { - int e = errno; - pop_quit (); - errno = e; - adios (packfile, "write error on"); - } - map_write (packfile, pd, 0, 0L, start, stop, pos, size, noisy); - } else { - if (ferror(pf) || fclose (pf)) { - int e = errno; - (void) m_unlink (cp); - pop_quit (); - errno = e; - adios (cp, "write error on"); - } - free (cp); - } + if (ferror(pf) || fclose (pf)) { + int e = errno; + (void) m_unlink (cp); + pop_quit (); + errno = e; + adios (cp, "write error on"); + } + free (cp); if (trnflag && pop_dele (i) == NOTOK) adios (NULL, "%s", response); @@ -734,16 +651,10 @@ go_to_it: if (pop_quit () == NOTOK) adios (NULL, "%s", response); - if (packfile) { - mbx_close (packfile, pd); - pd = NOTOK; - } - } - /* - * Get the mail from file (usually mail spool) - */ - if (inc_type == INC_FILE && Maildir == NULL) { + } else if (inc_type == INC_FILE && Maildir == NULL) { + /* Mail from a spool file. */ + scan_detect_mbox_style (in); /* the MAGIC invocation... */ hghnum = msgnum = mp->hghmsg; for (;;) { @@ -795,7 +706,9 @@ go_to_it: */ break; } - } else if (inc_type == INC_FILE) { /* Maildir inbox to process */ + + } else { + /* Mail from Maildir. */ char *sp; FILE *sf; int i; @@ -836,16 +749,16 @@ go_to_it: fseek (pf, 0L, SEEK_SET); switch (incerr = scan (pf, msgnum, 0, nfs, width, msgnum == mp->hghmsg + 1 && chgflag, - 1, NULL, stop - start, noisy, &scanl)) { + 1, NULL, 0, noisy, &scanl)) { case SCNEOF: printf ("%*d empty\n", DMAXFOLDER, msgnum); break; case SCNFAT: trnflag = 0; - noisy++; + noisy = true; /* advise (cp, "unable to read"); already advised */ - /* FALLTHRU */ + break; case SCNERR: case SCNNUM: @@ -906,13 +819,9 @@ go_to_it: if (noisy) fflush (stdout); - if ((inc_type == INC_POP) && packfile) - done (0); - - /* - * truncate file we are incorporating from - */ if (inc_type == INC_FILE && Maildir == NULL) { + /* Mail from a spool file; truncate it. */ + if (trnflag) { if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime) inform("new messages have arrived!\007"); @@ -922,7 +831,6 @@ go_to_it: close (newfd); else admonish (newmail, "error zero'ing"); - (void) m_unlink(map_name(newmail)); } } else { if (noisy) @@ -977,12 +885,11 @@ go_to_it: seq_save(mp2); /* Save the sequence file */ folder_free(mp2); } -skip: - /* - * unlock the mail spool - */ +skip: if (inc_type == INC_FILE && Maildir == NULL) { + /* Mail from a spool file; unlock it. */ + if (locked) { GETGROUPPRIVS(); /* Be sure we can unlock mail file */ (void) lkfclosespool (in, newmail); in = NULL; @@ -998,12 +905,10 @@ skip: } -static void +static void NORETURN inc_done (int status) { - done = exit; - if (packfile && pd != NOTOK) - mbx_close (packfile, pd); + set_done(exit); if (locked) { GETGROUPPRIVS(); @@ -1014,45 +919,16 @@ inc_done (int status) } static int -pop_action (char *s) +pop_action(void *closure, char *s) { - fprintf (pf, "%s\n", s); - stop += strlen (s) + 1; - return 0; /* Is return value used? This was missing before 1999-07-15. */ -} + pop_closure *pc; + int n; -static int -pop_pack (char *s) -{ - int j; - char buffer[BUFSIZ]; - - snprintf (buffer, sizeof(buffer), "%s\n", s); - for ( ; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++) - continue; - for ( ; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++) - continue; - fputs (buffer, pf); - size += strlen (buffer) + 1; - return 0; /* Is return value used? This was missing before 1999-07-15. */ -} + pc = closure; + n = fprintf(pc->mailout, "%s\n", s); + if (n < 0) + return NOTOK; + pc->written += n; /* Count linefeed too. */ -static int -map_count (void) -{ - int md; - char *cp; - struct drop d; - struct stat st; - - if (stat (packfile, &st) == NOTOK) - return 0; - if ((md = open (cp = map_name (packfile), O_RDONLY)) == NOTOK - || map_chk (cp, md, &d, (long) st.st_size, 1)) { - if (md != NOTOK) - close (md); - return 0; - } - close (md); - return (d.d_id); + return OK; }