X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fpopi.c;h=e26e346ee6760503a609d2b12a02eb40d8e6847b;hb=71932c5d0b008eb518d53f9a53978afd35a70ef5;hp=a48c2234e8c18f4dc80f7db29905777411061ab2;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822;p=mmh

diff --git a/uip/popi.c b/uip/popi.c
index a48c223..e26e346 100644
--- a/uip/popi.c
+++ b/uip/popi.c
@@ -3,12 +3,16 @@
  * 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 <errno.h>
 
 #ifndef	RPOP
@@ -65,7 +69,7 @@ static struct swit  switches[] = {
 #define VERSIONSW              13
     { "version", 0 },
 #define	HELPSW                 14
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -76,7 +80,6 @@ static char mailname[BUFSIZ];
 static char *nfs = NULL;
 static struct msgs *mp;
 
-extern int errno;
 extern char response[];
 
 /*
@@ -211,7 +214,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 ());
@@ -515,7 +518,7 @@ msh (void)
 
 
 #ifdef SMTPMTS
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <mts/smtp/smtp.h>
 
 static int