X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=5b48483ae915b94cfaf4ceb817baedc218346302;hb=c16dc1b7987ffd6e7dde224192862691515a09ec;hp=14322ab270046492e29ada891486b94c67c8cc4c;hpb=164be8e5e8b40ce4572281be26d423a9c9d595f3;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 14322ab..5b48483 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>
@@ -1042,6 +1041,8 @@ invalid:
 static int
 InitGeneric (CT ct)
 {
+    NMH_UNUSED (ct);
+
     return OK;		/* not much to do here */
 }
 
@@ -2485,10 +2486,8 @@ openFTP (CT ct, char **file)
     if ((ftp = context_find (nmhaccessftp)) && !*ftp)
 	ftp = NULL;
 
-#ifndef BUILTIN_FTP
     if (!ftp)
 	return NOTOK;
-#endif
 
     switch (openExternal (e->eb_parent, e->eb_content, ce, file, &fd)) {
 	case NOTOK:
@@ -2555,7 +2554,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);
@@ -2587,9 +2587,6 @@ openFTP (CT ct, char **file)
 	return NOTOK;
     }
 
-#ifdef BUILTIN_FTP
-    if (ftp)
-#endif
     {
 	int child_id, i, vecp;
 	char *vec[9];
@@ -2608,7 +2605,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:
@@ -2625,9 +2622,6 @@ openFTP (CT ct, char **file)
 
 	    default:
 		if (pidXwait (child_id, NULL)) {
-#ifdef BUILTIN_FTP
-losing_ftp:
-#endif
 		    username = password = NULL;
 		    ce->ce_unlink = 1;
 		    return NOTOK;
@@ -2635,14 +2629,6 @@ losing_ftp:
 		break;
 	}
     }
-#ifdef BUILTIN_FTP
-    else
-	if (ftp_get (e->eb_site, user, pass, e->eb_dir, e->eb_name,
-		     ce->ce_file,
-		     e->eb_mode && !mh_strcasecmp (e->eb_mode, "ascii"), 0)
-	        == NOTOK)
-	    goto losing_ftp;
-#endif
 
     if (cachefile[0]) {
 	if (caching)
@@ -2761,7 +2747,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: