content_error(): Add missing va_end(3).

[nmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index 3aa5e50fde06fbf4e579d2bdac13a1e5b741c89e..ad454e10dfef39d465f2570f167bf8b5ff1b6cee 100644 (file)
--- 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -8,7 +6,13 @@
  */
 
 #ifdef MAILGROUP
  */
 
 #ifdef MAILGROUP

-/* Revised: Sat Apr 14 17:08:17 PDT 1990 (marvit@hplabs)
+/*
+ * Thu Feb 12 21:00 CST 2015            Marcin Cieslak <saper@saper.info>
+ *    Replaced setgid() calls with setegid() so that it works with dot
+ *    locking on FreeBSD.  setegid() should be supported on modern POSIX
+ *    systems.
+ *
+ * Revised: Sat Apr 14 17:08:17 PDT 1990 (marvit@hplabs)

  *    Added hpux hacks to set and reset gid to be "mail" as needed. The reset
  *    is necessary so inc'ed mail is the group of the inc'er, rather than
  *    "mail". We setgid to egid only when [un]locking the mail file. This
  *    Added hpux hacks to set and reset gid to be "mail" as needed. The reset
  *    is necessary so inc'ed mail is the group of the inc'er, rather than
  *    "mail". We setgid to egid only when [un]locking the mail file. This


@@ -36,11 +40,14 @@
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <h/signals.h>
 #include <h/tws.h>
 #include <h/mts.h>

+#include "../sbr/lock_file.h"
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"

 
 

-#ifndef CYRUS_SASL
-# define SASLminc(a) (a)
+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)

 #else
 #else

-# define SASLminc(a)  0
+# define TLSminc(a)  0

 #endif
 
 #define INC_SWITCHES \
 #endif
 
 #define INC_SWITCHES \


@@ -53,8 +60,6 @@
     X("format string", 5, FMTSW) \
     X("host hostname", 0, HOSTSW) \
     X("user username", 0, USERSW) \
     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) \
     X("port name/number", 0, PORTSW) \
     X("silent", 0, SILSW) \
     X("nosilent", 0, NSILSW) \


@@ -63,10 +68,15 @@
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("width columns", 0, WIDTHSW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \

-    X("snoop", -5, SNOOPSW) \
-    X("sasl", SASLminc(-4), SASLSW) \
-    X("nosasl", SASLminc(-6), NOSASLSW) \
-    X("saslmech", SASLminc(-8), SASLMECHSW) \
+    X("snoop", 0, SNOOPSW) \
+    X("sasl", 0, SASLSW) \
+    X("nosasl", 0, NOSASLSW) \
+    X("saslmech", 0, SASLMECHSW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
+    X("notls", TLSminc(-5), NOTLSSW) \
+    X("certverify", TLSminc(-10), CERTVERSW) \
+    X("nocertverify", TLSminc(-12), NOCERTVERSW) \
+    X("authservice", 0, AUTHSERVICESW) \

     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,


@@ -83,7 +93,6 @@ DEFINE_SWITCH_ARRAY(INC, switches);
 #define INC_FILE  0
 #define INC_POP   1
 
 #define INC_FILE  0
 #define INC_POP   1
 

-static int inc_type;

 static struct Maildir_entry {
        char *filename;
        time_t mtime;
 static struct Maildir_entry {
        char *filename;
        time_t mtime;


@@ -91,19 +100,12 @@ static struct Maildir_entry {
 static int num_maildir_entries = 0;
 static int snoop = 0;
 
 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;
+typedef struct {
+    FILE *mailout;
+    long written;
+} pop_closure;

 
 

-static long start;
-static long stop;
-
-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.
 
 /* This is an attempt to simplify things by putting all the
  * privilege ops into macros.


@@ -127,10 +129,16 @@ static FILE *pf = NULL;
  * For setting and returning to "mail" gid
  */
 #ifdef MAILGROUP
  * For setting and returning to "mail" gid
  */
 #ifdef MAILGROUP

-static int return_gid;
+static gid_t return_gid;

 #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS()
 #define TRYDROPGROUPPRIVS() DROPGROUPPRIVS()

-#define DROPGROUPPRIVS() setgid(getgid())
-#define GETGROUPPRIVS() setgid(return_gid)
+#define DROPGROUPPRIVS() \
+    if (setegid(getgid()) != 0) { \
+        adios ("setegid", "unable to restore group to %ld", (long) getgid()); \
+    }
+#define GETGROUPPRIVS() \
+    if (setegid(return_gid) != 0) { \
+        adios ("setegid", "unable to set group to %ld", (long) return_gid); \
+    }

 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
 /* define *GROUPPRIVS() as null; this avoids having lots of "#ifdef MAILGROUP"s */
 #define SAVEGROUPPRIVS() return_gid = getegid()
 #else
 /* define *GROUPPRIVS() as null; this avoids having lots of "#ifdef MAILGROUP"s */


@@ -141,44 +149,44 @@ static int return_gid;
 #endif /* not MAILGROUP */
 
 /* these variables have to be globals so that done() can correctly clean up the lockfile */
 #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
  */
 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 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;
     if (a->mtime > b->mtime)
       return 1;
 maildir_srt(const void *va, const void *vb)
 {
     const struct Maildir_entry *a = va, *b = vb;
     if (a->mtime > b->mtime)
       return 1;

-    else if (a->mtime < b->mtime)
+    if (a->mtime < b->mtime)

       return -1;
       return -1;

-    else
-      return 0;
+    return 0;

 }
 
 int
 main (int argc, char **argv)
 {
 }
 
 int
 main (int argc, char **argv)
 {

-    int chgflag = 1, trnflag = 1;
-    int noisy = 1, width = 0;
+    static int inc_type;
+    bool chgflag;
+    int trnflag = 1;
+    bool noisy;
+    int width = -1;

     int hghnum = 0, msgnum = 0;
     int hghnum = 0, msgnum = 0;

-    int sasl = 0;
+    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;
     char *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     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;
     char *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;

-    char *audfile = NULL, *from = NULL, *saslmech = NULL;
+    char *audfile = NULL, *from = NULL, *saslmech = NULL, *auth_svc = NULL;

     char buf[BUFSIZ], **argp, *nfs, **arguments;
     struct msgs *mp = NULL;
     struct stat st, s1;
     char buf[BUFSIZ], **argp, *nfs, **arguments;
     struct msgs *mp = NULL;
     struct stat st, s1;


@@ -188,7 +196,6 @@ main (int argc, char **argv)
 
     int nmsgs, nbytes;
     char *MAILHOST_env_variable;
 
     int nmsgs, nbytes;
     char *MAILHOST_env_variable;

-

     done=inc_done;
 
 /* absolutely the first thing we do is save our privileges,
     done=inc_done;
 
 /* absolutely the first thing we do is save our privileges,


@@ -197,13 +204,9 @@ main (int argc, char **argv)
     SAVEGROUPPRIVS();
     TRYDROPGROUPPRIVS();
 
     SAVEGROUPPRIVS();
     TRYDROPGROUPPRIVS();
 

-    setlocale(LC_ALL, "");
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }

 
 

-    /* read user profile/context */
-    context_read();
-
-    mts_init (invo_name);
+    mts_init ();

     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 


@@ -223,16 +226,18 @@ main (int argc, char **argv)
     if (pophost && *pophost)
        host = pophost;
 
     if (pophost && *pophost)
        host = pophost;
 

+    sasl = tls = false;
+    chgflag = noisy = noverify = true;

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {

-           case AMBIGSW: 
+           case AMBIGSW:

                ambigsw (cp, switches);
                done (1);
                ambigsw (cp, switches);
                done (1);

-           case UNKWNSW: 
+           case UNKWNSW:

                adios (NULL, "-%s unknown", cp);
 
                adios (NULL, "-%s unknown", cp);
 

-           case HELPSW: 
+           case HELPSW:

                snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                print_help (buf, switches, 1);
                done (0);
                snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                print_help (buf, switches, 1);
                done (0);


@@ -240,20 +245,20 @@ main (int argc, char **argv)
                print_version(invo_name);
                done (0);
 
                print_version(invo_name);
                done (0);
 

-           case AUDSW: 
+           case AUDSW:

                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                audfile = getcpy (m_maildir (cp));
                continue;
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                audfile = getcpy (m_maildir (cp));
                continue;

-           case NAUDSW: 
+           case NAUDSW:

                audfile = NULL;
                continue;
 
                audfile = NULL;
                continue;
 

-           case CHGSW: 
-               chgflag++;
+           case CHGSW:
+                chgflag = true;

                continue;
                continue;

-           case NCHGSW: 
-               chgflag = 0;
+           case NCHGSW:
+                chgflag = false;

                continue;
 
            /*
                continue;
 
            /*


@@ -263,14 +268,14 @@ main (int argc, char **argv)
             * 1 by default (truncating is default)
             * 0 if -notruncate is given
             */
             * 1 by default (truncating is default)
             * 0 if -notruncate is given
             */

-           case TRNCSW: 
+           case TRNCSW:

                trnflag = 2;
                continue;
                trnflag = 2;
                continue;

-           case NTRNCSW: 
+           case NTRNCSW:

                trnflag = 0;
                continue;
 
                trnflag = 0;
                continue;
 

-           case FILESW: 
+           case FILESW:

                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                from = path (cp, TFILE);
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                from = path (cp, TFILE);


@@ -283,25 +288,25 @@ main (int argc, char **argv)
                    trnflag = 0;
                continue;
 
                    trnflag = 0;
                continue;
 

-           case SILSW: 
-               noisy = 0;
+           case SILSW:
+                noisy = false;

                continue;
                continue;

-           case NSILSW: 
-               noisy++;
+           case NSILSW:
+                noisy = true;

                continue;
 
                continue;
 

-           case FORMSW: 
+           case FORMSW:

                if (!(form = *argp++) || *form == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                format = NULL;
                continue;
                if (!(form = *argp++) || *form == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                format = NULL;
                continue;

-           case FMTSW: 
+           case FMTSW:

                if (!(format = *argp++) || *format == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                form = NULL;
                continue;
 
                if (!(format = *argp++) || *format == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                form = NULL;
                continue;
 

-           case WIDTHSW: 
+           case WIDTHSW:

                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                width = atoi (cp);
                if (!(cp = *argp++) || *cp == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                width = atoi (cp);


@@ -322,29 +327,47 @@ main (int argc, char **argv)
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
 
                    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:
            case SNOOPSW:
                snoop++;
                continue;
        
            case SASLSW:

-               sasl++;
+                sasl = true;

                continue;
            case NOSASLSW:
                continue;
            case NOSASLSW:

-               sasl = 0;
+                sasl = false;

                continue;
        
            case SASLMECHSW:
                if (!(saslmech = *argp++) || *saslmech == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
                continue;
        
            case SASLMECHSW:
                if (!(saslmech = *argp++) || *saslmech == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;

+
+           case INITTLSSW:
+                tls = true;
+               continue;
+
+           case NOTLSSW:
+                tls = false;
+               continue;
+
+           case CERTVERSW:
+                noverify = false;
+               continue;
+
+           case NOCERTVERSW:
+                noverify = true;
+               continue;
+
+           case AUTHSERVICESW:
+#ifdef OAUTH_SUPPORT
+                if (!(auth_svc = *argp++) || *auth_svc == '-')
+                    adios (NULL, "missing argument to %s", argp[-2]);
+#else
+                adios (NULL, "not built with OAuth support");
+#endif
+                continue;
+

            case PROXYSW:
                if (!(proxy = *argp++) || *proxy == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
            case PROXYSW:
                if (!(proxy = *argp++) || *proxy == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);


@@ -354,8 +377,7 @@ main (int argc, char **argv)
        if (*cp == '+' || *cp == '@') {
            if (folder)
                adios (NULL, "only one folder at a time!");
        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);
        }
        } else {
            adios (NULL, "usage: %s [+folder] [switches]", invo_name);
        }


@@ -367,32 +389,37 @@ main (int argc, char **argv)
     if (host && !*host)
        host = NULL;
 
     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();
 
     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) {
     if (inc_type == INC_POP) {

-       struct nmh_creds creds = { 0, 0, 0 };
+        /* Mail from a POP server. */
+       int tlsflag = 0;
+
+       if (auth_svc == NULL) {
+           if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
+               adios (NULL, "must specify -authservice with -saslmech xoauth2");
+           }
+       } else {
+           if (user == NULL) {
+               adios (NULL, "must specify -user with -saslmech xoauth2");
+           }
+       }
+
+       if (tls)
+           tlsflag |= P_INITTLS;
+
+       if (noverify)
+           tlsflag |= P_NOVERIFY;

 
        /*
         * initialize POP connection
         */
 
        /*
         * initialize POP connection
         */

-       nmh_get_credentials (host, user, sasl, &creds);
-       if (pop_init (host, port, creds.user, creds.password, proxy, snoop,
-                     sasl, saslmech) == NOTOK)
+       if (pop_init (host, port, user, proxy, snoop, sasl, saslmech,
+                     tlsflag, auth_svc) == NOTOK)

            adios (NULL, "%s", response);
 
        /* Check if there are any messages */
            adios (NULL, "%s", response);
 
        /* Check if there are any messages */


@@ -403,14 +430,9 @@ main (int argc, char **argv)
            pop_quit();
            adios (NULL, "no mail to incorporate");
        }
            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)
        if (from)
            newmail = from;
        else if ((newmail = getenv ("MAILDROP")) && *newmail)


@@ -472,24 +494,16 @@ main (int argc, char **argv)
            qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
        }
 
            qsort (Maildir, num_maildir_entries, sizeof(*Maildir), maildir_srt);
        }
 

-       if ((cp = strdup(newmail)) == (char *)0)
-           adios (NULL, "error allocating memory to copy newmail");
-
+       cp = mh_xstrdup(newmail);

        newmail = cp;
     }
 
        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)
        folder = getfolder (0);
     maildir = m_maildir (folder);
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
     if (!folder)
        folder = getfolder (0);
     maildir = m_maildir (folder);

-
-    if ((maildir_copy = strdup(maildir)) == (char *)0)
-        adios (maildir, "error allocating memory to copy maildir");
+    maildir_copy = mh_xstrdup(maildir);

 
     if (!folder_exists(maildir)) {
         /* If the folder doesn't exist, and we're given the -silent flag,
 
     if (!folder_exists(maildir)) {
         /* If the folder doesn't exist, and we're given the -silent flag,


@@ -508,11 +522,11 @@ main (int argc, char **argv)
     if (!(mp = folder_read (folder, 0)))
        adios (NULL, "unable to read folder %s", folder);
 
     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 (inc_type == INC_FILE && Maildir == NULL) {

+        /* Mail from a spool file. */
+

        if (access (newmail, W_OK) != NOTOK) {
        if (access (newmail, W_OK) != NOTOK) {

-           locked++;
+           locked = true;

            if (trnflag) {
                SIGNAL (SIGHUP, SIG_IGN);
                SIGNAL (SIGINT, SIG_IGN);
            if (trnflag) {
                SIGNAL (SIGHUP, SIG_IGN);
                SIGNAL (SIGINT, SIG_IGN);


@@ -539,10 +553,10 @@ go_to_it:
     if (audfile) {
        int i;
        if ((i = stat (audfile, &st)) == NOTOK)
     if (audfile) {
        int i;
        if ((i = stat (audfile, &st)) == NOTOK)

-           advise (NULL, "Creating Receive-Audit: %s", audfile);
+           inform("Creating Receive-Audit: %s", audfile);

        if ((aud = fopen (audfile, "a")) == NULL)
            adios (audfile, "unable to append to");
        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)
            chmod (audfile, m_gmprot ());
 
        if (from)


@@ -569,143 +583,102 @@ go_to_it:
      * Get the mail from a POP server
      */
     if (inc_type == INC_POP) {
      * Get the mail from a POP server
      */
     if (inc_type == INC_POP) {

+        /* Mail from a POP server. */

        int i;
        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 && !getanswer (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++) {
        for (i = 1; i <= nmsgs; i++) {

-           msgnum++;
-           if (packfile) {
-               fseek (pf, 0L, SEEK_CUR);
-               pos = ftell (pf);
-               size = 0;
-               fwrite (mmdlm1, 1, strlen (mmdlm1), pf);
-               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 = getcpy (m_name (msgnum));
-               if ((pf = fopen (cp, "w+")) == NULL)
-                   adios (cp, "unable to write");
-               chmod (cp, m_gmprot ());
-               start = stop = 0L;
+           charstring_t scanl = NULL;

 
 

-               if (pop_retr (i, pop_action) == NOTOK)
-                   adios (NULL, "%s", response);
-
-               if (fflush (pf))
-                   adios (cp, "write error on");
-               fseek (pf, 0L, SEEK_SET);
-           }
+           msgnum++;
+            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,
            switch (incerr = scan (pf, msgnum, 0, nfs, width,

-                             packfile ? 0 : msgnum == mp->hghmsg + 1 && chgflag,
-                             1, NULL, stop - start, noisy)) {
-           case SCNEOF: 
+                             msgnum == mp->hghmsg + 1 && chgflag,
+                             1, NULL, pc.written, noisy, &scanl)) {
+           case SCNEOF:

                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;
 
            case SCNFAT:
                trnflag = 0;
                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;
 
            case SCNFAT:
                trnflag = 0;

-               noisy++;
+               noisy = true;

                /* advise (cp, "unable to read"); already advised */
                /* advise (cp, "unable to read"); already advised */

-               /* fall thru */
+               break;

 
            case SCNERR:
 
            case SCNERR:

-           case SCNNUM: 
+           case SCNNUM:

                break;
 
                break;
 

-           case SCNMSG: 
+           case SCNMSG:

            case SCNENC:
            case SCNENC:

-           default: 
+           default:

                if (aud)
                if (aud)

-                   fputs (scanl, aud);
+                   fputs (charstring_buffer (scanl), aud);

                if (noisy)
                    fflush (stdout);
                break;
            }
                if (noisy)
                    fflush (stdout);
                break;
            }

-           if (packfile) {
-               fseek (pf, stop, SEEK_SET);
-               fwrite (mmdlm2, 1, strlen (mmdlm2), pf);
-               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;
-                   unlink (cp);
-                   pop_quit ();
-                   errno = e;
-                   adios (cp, "write error on");
-               }
-               free (cp);
-           }
+           charstring_free (scanl);
+
+            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);
 
            if (trnflag && pop_dele (i) == NOTOK)
                adios (NULL, "%s", response);

+
+           scan_finished();

        }
 
        if (pop_quit () == NOTOK)
            adios (NULL, "%s", response);
        }
 
        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 (;;) {
        scan_detect_mbox_style (in);            /* the MAGIC invocation... */
        hghnum = msgnum = mp->hghmsg;
        for (;;) {

+           charstring_t scanl = NULL;
+

            /* create scanline for new message */
            switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,
            /* create scanline for new message */
            switch (incerr = scan (in, msgnum + 1, msgnum + 1, nfs, width,

-                             msgnum == hghnum && chgflag, 1, NULL, 0L, noisy)) {
+                             msgnum == hghnum && chgflag, 1, NULL, 0L, noisy,
+                             &scanl)) {

            case SCNFAT:
            case SCNFAT:

-           case SCNEOF: 
+           case SCNEOF:

                break;
 
            case SCNERR:
                if (aud)
                    fputs ("inc aborted!\n", aud);
                break;
 
            case SCNERR:
                if (aud)
                    fputs ("inc aborted!\n", aud);

-               advise (NULL, "aborted!");      /* doesn't clean up locks! */
+               inform("aborted!");     /* doesn't clean up locks! */

                break;
 
                break;
 

-           case SCNNUM: 
-               advise (NULL, "BUG in %s, number out of range", invo_name);
+           case SCNNUM:
+               inform("BUG in %s, number out of range", invo_name);

                break;
 
                break;
 

-           default: 
-               advise (NULL, "BUG in %s, scan() botch (%d)", invo_name, incerr);
+           default:
+               inform("BUG in %s, scan() botch (%d)", invo_name, incerr);

                break;
 
            case SCNMSG:
                break;
 
            case SCNMSG:


@@ -715,32 +688,38 @@ go_to_it:
                 */
 
                (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
                 */
 
                (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);

-               (void)ext_hook("add-hook", b, (char *)0);
+               (void)ext_hook("add-hook", b, NULL);

 
                if (aud)
 
                if (aud)

-                   fputs (scanl, aud);
+                   fputs (charstring_buffer (scanl), aud);

                if (noisy)
                    fflush (stdout);
 
                msgnum++;
                continue;
            }
                if (noisy)
                    fflush (stdout);
 
                msgnum++;
                continue;
            }

+           charstring_free (scanl);
+

            /* If we get here there was some sort of error from scan(),
             * so stop processing anything more from the spool.
             */
            break;
        }
            /* If we get here there was some sort of error from scan(),
             * so stop processing anything more from the spool.
             */
            break;
        }

-    } else if (inc_type == INC_FILE) { /* Maildir inbox to process */
+
+    } else {
+        /* Mail from Maildir. */

        char *sp;
        FILE *sf;
        int i;
 
        hghnum = msgnum = mp->hghmsg;
        for (i = 0; i < num_maildir_entries; i++) {
        char *sp;
        FILE *sf;
        int i;
 
        hghnum = msgnum = mp->hghmsg;
        for (i = 0; i < num_maildir_entries; i++) {

+           charstring_t scanl = NULL;
+

            msgnum++;
 
            sp = Maildir[i].filename;
            msgnum++;
 
            sp = Maildir[i].filename;

-           cp = getcpy (m_name (msgnum));
+           cp = mh_xstrdup(m_name (msgnum));

            pf = NULL;
            if (!trnflag || link(sp, cp) == -1) {
                static char buf[65536];
            pf = NULL;
            if (!trnflag || link(sp, cp) == -1) {
                static char buf[65536];


@@ -755,13 +734,13 @@ go_to_it:
                        break;
                if (ferror(sf) || fflush(pf) || ferror(pf)) {
                        int e = errno;
                        break;
                if (ferror(sf) || fflush(pf) || ferror(pf)) {
                        int e = errno;

-                       fclose(pf); fclose(sf); unlink(cp);
+                       fclose(pf); fclose(sf); (void) m_unlink(cp);

                        errno = e;
                        adios(cp, "copy error %s -> %s", sp, cp);
                }
                fclose (sf);
                sf = NULL;
                        errno = e;
                        adios(cp, "copy error %s -> %s", sp, cp);
                }
                fclose (sf);
                sf = NULL;

-           } 
+           }

            if (pf == NULL && (pf = fopen (cp, "r")) == NULL)
                adios (cp, "not available");
            chmod (cp, m_gmprot ());
            if (pf == NULL && (pf = fopen (cp, "r")) == NULL)
                adios (cp, "not available");
            chmod (cp, m_gmprot ());


@@ -769,49 +748,53 @@ go_to_it:
            fseek (pf, 0L, SEEK_SET);
            switch (incerr = scan (pf, msgnum, 0, nfs, width,
                              msgnum == mp->hghmsg + 1 && chgflag,
            fseek (pf, 0L, SEEK_SET);
            switch (incerr = scan (pf, msgnum, 0, nfs, width,
                              msgnum == mp->hghmsg + 1 && chgflag,

-                             1, NULL, stop - start, noisy)) {
-           case SCNEOF: 
+                             1, NULL, 0, noisy, &scanl)) {
+           case SCNEOF:

                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;
 
            case SCNFAT:
                trnflag = 0;
                printf ("%*d  empty\n", DMAXFOLDER, msgnum);
                break;
 
            case SCNFAT:
                trnflag = 0;

-               noisy++;
+               noisy = true;

                /* advise (cp, "unable to read"); already advised */
                /* advise (cp, "unable to read"); already advised */

-               /* fall thru */
+               break;

 
            case SCNERR:
 
            case SCNERR:

-           case SCNNUM: 
+           case SCNNUM:

                break;
 
                break;
 

-           case SCNMSG: 
+           case SCNMSG:

            case SCNENC:
            case SCNENC:

-           default: 
+           default:

                /*
                 *  Run the external program hook on the message.
                 */
 
                (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);
                /*
                 *  Run the external program hook on the message.
                 */
 
                (void)snprintf(b, sizeof (b), "%s/%d", maildir_copy, msgnum + 1);

-               (void)ext_hook("add-hook", b, (char *)0);
+               (void)ext_hook("add-hook", b, NULL);

 
                if (aud)
 
                if (aud)

-                   fputs (scanl, aud);
+                   fputs (charstring_buffer (scanl), aud);

                if (noisy)
                    fflush (stdout);
                break;
            }
                if (noisy)
                    fflush (stdout);
                break;
            }

+           charstring_free (scanl);
+

            if (ferror(pf) || fclose (pf)) {
                int e = errno;
            if (ferror(pf) || fclose (pf)) {
                int e = errno;

-               unlink (cp);
+               (void) m_unlink (cp);

                errno = e;
                adios (cp, "write error on");
            }
            pf = NULL;
            free (cp);
 
                errno = e;
                adios (cp, "write error on");
            }
            pf = NULL;
            free (cp);
 

-           if (trnflag && unlink (sp) == NOTOK)
+           if (trnflag && m_unlink (sp) == NOTOK)

                adios (sp, "couldn't unlink");
            free (sp); /* Free Maildir[i]->filename */
                adios (sp, "couldn't unlink");
            free (sp); /* Free Maildir[i]->filename */

+
+           scan_finished();

        }
        free (Maildir); /* From now on Maildir is just a flag - don't dref! */
     }
        }
        free (Maildir); /* From now on Maildir is just a flag - don't dref! */
     }


@@ -835,23 +818,18 @@ go_to_it:
     if (noisy)
        fflush (stdout);
 
     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) {
     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)
        if (trnflag) {
            if (stat (newmail, &st) != NOTOK && s1.st_mtime != st.st_mtime)

-               advise (NULL, "new messages have arrived!\007");
+               inform("new messages have arrived!\007");

            else {
                int newfd;
                if ((newfd = creat (newmail, 0600)) != NOTOK)
                    close (newfd);
                else
                    admonish (newmail, "error zero'ing");
            else {
                int newfd;
                if ((newfd = creat (newmail, 0600)) != NOTOK)
                    close (newfd);
                else
                    admonish (newmail, "error zero'ing");

-               unlink(map_name(newmail));

            }
        } else {
            if (noisy)
            }
        } else {
            if (noisy)


@@ -860,7 +838,7 @@ go_to_it:
     }
 
     if (msgnum == hghnum) {
     }
 
     if (msgnum == hghnum) {

-       admonish (NULL, "no messages incorporated");
+       inform("no messages incorporated, continuing...");

     } else {
        /*
         * Lock the sequence file now, and loop to set the right flags
     } else {
        /*
         * Lock the sequence file now, and loop to set the right flags


@@ -873,7 +851,7 @@ go_to_it:
        context_replace (pfolder, folder);      /* update current folder */
 
        if ((mp2 = folder_read(folder, 1)) == NULL) {
        context_replace (pfolder, folder);      /* update current folder */
 
        if ((mp2 = folder_read(folder, 1)) == NULL) {

-           admonish(NULL, "Unable to reread folder %s", folder);
+           inform("Unable to reread folder %s, continuing...", folder);

            goto skip;
        }
 
            goto skip;
        }
 


@@ -883,7 +861,7 @@ go_to_it:
 
        if (msgnum >= mp2->hghoff
                && !(mp2 = folder_realloc (mp2, mp2->lowoff, msgnum + 1))) {
 
        if (msgnum >= mp2->hghoff
                && !(mp2 = folder_realloc (mp2, mp2->lowoff, msgnum + 1))) {

-           advise (NULL, "unable to reallocate folder storage");
+           inform("unable to reallocate folder storage");

            goto skip;
        }
 
            goto skip;
        }
 


@@ -906,12 +884,11 @@ go_to_it:
        seq_save(mp2);          /* Save the sequence file */
        folder_free(mp2);
     }
        seq_save(mp2);          /* Save the sequence file */
        folder_free(mp2);
     }

-skip:

 
 

-    /*
-     * unlock the mail spool
-     */
+skip:

     if (inc_type == INC_FILE && Maildir == NULL) {
     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;
        if (locked) {
            GETGROUPPRIVS();        /* Be sure we can unlock mail file */
            (void) lkfclosespool (in, newmail); in = NULL;


@@ -927,11 +904,10 @@ skip:
 }
 
 
 }
 
 

-static void
+static void NORETURN

 inc_done (int status)
 {
 inc_done (int status)
 {

-    if (packfile && pd != NOTOK)
-       mbx_close (packfile, pd);
+    done = exit;

     if (locked)
     {
         GETGROUPPRIVS();
     if (locked)
     {
         GETGROUPPRIVS();


@@ -942,45 +918,16 @@ inc_done (int status)
 }
 
 static int
 }
 
 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 = 0; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
-       continue;
-    for (j = 0; (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;

 }
 }