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

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d40d78c..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>
@@ -20,10 +19,6 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 
 extern int debugsw;
 
@@ -90,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 */
@@ -1046,6 +1037,8 @@ invalid:
 static int
 InitGeneric (CT ct)
 {
+    NMH_UNUSED (ct);
+
     return OK;		/* not much to do here */
 }
 
@@ -2489,10 +2482,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:
@@ -2559,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);
@@ -2591,9 +2583,6 @@ openFTP (CT ct, char **file)
 	return NOTOK;
     }
 
-#ifdef BUILTIN_FTP
-    if (ftp)
-#endif
     {
 	int child_id, i, vecp;
 	char *vec[9];
@@ -2612,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:
@@ -2629,9 +2618,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;
@@ -2639,14 +2625,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)
@@ -2765,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: