Added -nocontentid (and -contentid, for symmetry) switch to mhbuild. This allows...

[mmh] / uip / popi.c

diff --git a/uip/popi.c b/uip/popi.c
index 59ab61a..ef11a4a 100644 (file)
--- a/uip/popi.c
+++ b/uip/popi.c
@@ -3,12 +3,17 @@
  * popi.c -- POP initiator for MPOP
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
 #include <h/fmt_scan.h>
 #include <h/scansbr.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
+#include <h/utils.h>
 #include <errno.h>
 
 #ifndef        RPOP
@@ -65,7 +70,7 @@ static struct swit  switches[] = {
 #define VERSIONSW              13
     { "version", 0 },
 #define        HELPSW                 14
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -76,7 +81,6 @@ static char mailname[BUFSIZ];
 static char *nfs = NULL;
 static struct msgs *mp;
 
-extern int errno;
 extern char response[];
 
 /*
@@ -211,7 +215,7 @@ main (int argc, char **argv)
     }
     snprintf (mailname, sizeof(mailname), "PO box for %s@%s", user, host);
 
-    if (pop_init (host, user, pass, snoop, rpop) == NOTOK)
+    if (pop_init (host, user, pass, NULL, snoop, rpop) == NOTOK)
        adios (NULL, "%s", response);
     if (rpop > 0)
        setuid (getuid ());
@@ -255,9 +259,7 @@ main (int argc, char **argv)
     seq_setunseen (mp, 0);             /* set the Unseen-Sequence */
     seq_save (mp);
     context_save ();                   /* save the context file   */
-    done (0);
-
-    /* NOTREACHED */
+    return done (0);
 }
 
 
@@ -401,8 +403,7 @@ popi (void)
                        if (*dp == '\\' || *dp == '"' || *dp == '\n')
                            i++;
                    i++;
-                   if ((ep = malloc ((unsigned) i)) == NULL)
-                       adios (NULL, "out of memory");
+                   ep = mh_xmalloc ((unsigned) i);
                    for (dp = nfs, fp = ep; *dp; dp++) {
                        if (*dp == '\n') {
                            *fp++ = '\\', *fp++ = 'n';
@@ -517,7 +518,7 @@ msh (void)
 
 
 #ifdef SMTPMTS
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <mts/smtp/smtp.h>
 
 static int