* man/mhbuild.man: wrapped one appearance of "Content-Disposition"

[mmh] / uip / popi.c

diff --git a/uip/popi.c b/uip/popi.c
index a48c223..3a03c0a 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 ());
@@ -225,16 +229,7 @@ main (int argc, char **argv)
        folder = getfolder (0);
     maildir = m_maildir (folder);
 
-    if (stat (maildir, &st) == NOTOK) {
-       if (errno != ENOENT)
-           adios (maildir, "error on folder");
-       cp = concat ("Create folder \"", maildir, "\"? ", NULL);
-       if (noisy && !getanswer (cp))
-           done (1);
-       free (cp);
-       if (!makedir (maildir))
-           adios (NULL, "unable to create folder %s", maildir);
-    }
+    create_folder(maildir, 0, done);
 
     if (chdir (maildir) == NOTOK)
        adios (maildir, "unable to change directory to");
@@ -399,8 +394,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';
@@ -515,7 +509,7 @@ msh (void)
 
 
 #ifdef SMTPMTS
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <mts/smtp/smtp.h>
 
 static int