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

diff --git a/uip/mhparse.c b/uip/mhparse.c
index d40d78c..ea78b42 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -20,10 +20,6 @@
 #include <h/mhparse.h>
 #include <h/utils.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 
 extern int debugsw;
 
@@ -1046,6 +1042,8 @@ invalid:
 static int
 InitGeneric (CT ct)
 {
+    NMH_UNUSED (ct);
+
     return OK;		/* not much to do here */
 }
 
@@ -2474,7 +2472,8 @@ InitFTP (CT ct)
 static int
 openFTP (CT ct, char **file)
 {
-    int	cachetype, caching, fd;
+    int	cachetype, fd;
+    volatile int caching;
     int len, buflen;
     char *bp, *ftp, *user, *pass;
     char buffer[BUFSIZ], cachefile[BUFSIZ];
@@ -2489,10 +2488,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:
@@ -2591,9 +2588,6 @@ openFTP (CT ct, char **file)
 	return NOTOK;
     }
 
-#ifdef BUILTIN_FTP
-    if (ftp)
-#endif
     {
 	int child_id, i, vecp;
 	char *vec[9];
@@ -2629,9 +2623,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 +2630,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)