X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=e9a4ceebeb11cc4fa6b9ddc75dbdefe7e45fc163;hb=bc7839e29d6a4906bd0b8909fd12bb01933b143c;hp=ea78b42c4644fbe358cf95ac92b35ec557d96d0b;hpb=ca34fbd0a5204d47ad019f64ef03d21ebd3397fd;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index ea78b42..e9a4cee 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -12,7 +12,6 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -86,16 +85,12 @@ struct k2v SubApplication[] = {
 };
 
 
-/* ftpsbr.c */
-int ftp_get (char *, char *, char *, char *, char *, char *, int, int);
-
 /* mhcachesbr.c */
 int find_cache (CT, int, int *, char *, char *, int);
 
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-int make_intermediates (char *);
 void content_error (char *, CT, char *, ...);
 
 /* mhfree.c */
@@ -2472,8 +2467,7 @@ InitFTP (CT ct)
 static int
 openFTP (CT ct, char **file)
 {
-    int	cachetype, fd;
-    volatile int caching;
+    int	cachetype, caching, fd;
     int len, buflen;
     char *bp, *ftp, *user, *pass;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
@@ -2556,7 +2550,8 @@ openFTP (CT ct, char **file)
 
     if (e->eb_flags) {
 	user = "anonymous";
-	snprintf (buffer, sizeof(buffer), "%s@%s", getusername (), LocalName ());
+	snprintf (buffer, sizeof(buffer), "%s@%s", getusername (),
+		  LocalName (1));
 	pass = buffer;
     } else {
 	ruserpass (e->eb_site, &username, &password);
@@ -2606,7 +2601,7 @@ openFTP (CT ct, char **file)
 
 	fflush (stdout);
 
-	for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+	for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	    sleep (5);
 	switch (child_id) {
 	    case NOTOK:
@@ -2748,7 +2743,7 @@ openMail (CT ct, char **file)
     vec[vecp++] = e->eb_body;
     vec[vecp] = NULL;
 
-    for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK: