X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/fe86b6d55ac470e6e832c53ea2c71e680efe5274..e6c91771:/uip/inc.c?ds=inline diff --git a/uip/inc.c b/uip/inc.c index 1dea263b..f3888394 100644 --- a/uip/inc.c +++ b/uip/inc.c @@ -1,6 +1,4 @@ - -/* - * inc.c -- incorporate messages from a maildrop into a folder +/* inc.c -- incorporate messages from a maildrop into a folder * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -42,6 +40,9 @@ #include #include #include +#include "../sbr/lock_file.h" +#include "../sbr/m_maildir.h" +#include "../sbr/m_mktemp.h" #ifndef TLS_SUPPORT # define TLSminc(a) (a) @@ -59,8 +60,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) \ @@ -104,16 +103,9 @@ 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; -static char *packfile = NULL; static FILE *pf = NULL; /* This is an attempt to simplify things by putting all the @@ -165,12 +157,8 @@ static FILE *in; /* * prototypes */ -char *map_name(char *); - static void inc_done(int) NORETURN; static int pop_action(char *); -static int pop_pack(char *); -static int map_count(void); int maildir_srt(const void *va, const void *vb) @@ -186,10 +174,12 @@ maildir_srt(const void *va, const void *vb) int main (int argc, char **argv) { - int chgflag = 1, trnflag = 1; - int noisy = 1, width = -1; + bool chgflag; + int trnflag = 1; + bool noisy; + int width = -1; int hghnum = 0, msgnum = 0; - int sasl = 0, tls = 0, noverify = 1; + 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; @@ -234,6 +224,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)) { @@ -261,10 +253,10 @@ main (int argc, char **argv) continue; case CHGSW: - chgflag++; + chgflag = true; continue; case NCHGSW: - chgflag = 0; + chgflag = false; continue; /* @@ -295,10 +287,10 @@ main (int argc, char **argv) continue; case SILSW: - noisy = 0; + noisy = false; continue; case NSILSW: - noisy++; + noisy = true; continue; case FORMSW: @@ -333,23 +325,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: @@ -358,19 +342,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: @@ -404,7 +388,7 @@ 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(); /* @@ -528,10 +512,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) @@ -556,8 +536,6 @@ 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) { if (access (newmail, W_OK) != NOTOK) { locked++; @@ -618,65 +596,26 @@ go_to_it: */ if (inc_type == INC_POP) { 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; - } + 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 ()); + 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); switch (incerr = scan (pf, msgnum, 0, nfs, width, - packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag, + msgnum == mp->hghmsg + 1 && chgflag, 1, NULL, stop - start, noisy, &scanl)) { case SCNEOF: printf ("%*d empty\n", DMAXFOLDER, msgnum); @@ -686,7 +625,7 @@ go_to_it: trnflag = 0; noisy++; /* advise (cp, "unable to read"); already advised */ - /* FALLTHRU */ + break; case SCNERR: case SCNNUM: @@ -703,30 +642,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); @@ -736,10 +659,6 @@ go_to_it: if (pop_quit () == NOTOK) adios (NULL, "%s", response); - if (packfile) { - mbx_close (packfile, pd); - pd = NOTOK; - } } /* @@ -847,7 +766,7 @@ go_to_it: trnflag = 0; noisy++; /* advise (cp, "unable to read"); already advised */ - /* FALLTHRU */ + break; case SCNERR: case SCNNUM: @@ -908,9 +827,6 @@ go_to_it: if (noisy) fflush (stdout); - if ((inc_type == INC_POP) && packfile) - done (0); - /* * truncate file we are incorporating from */ @@ -924,7 +840,6 @@ go_to_it: close (newfd); else admonish (newmail, "error zero'ing"); - (void) m_unlink(map_name(newmail)); } } else { if (noisy) @@ -1000,12 +915,10 @@ skip: } -static void +static void NORETURN inc_done (int status) { done = exit; - if (packfile && pd != NOTOK) - mbx_close (packfile, pd); if (locked) { GETGROUPPRIVS(); @@ -1022,39 +935,3 @@ pop_action (char *s) stop += strlen (s) + 1; return 0; /* Is return value used? This was missing before 1999-07-15. */ } - -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. */ -} - -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); -}