[src/trunk]: src/usr.bin/ftp If no_proxy condition is true && urltype == FTP_...

[tacha <tacha%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8a1bcf41e70f
branches:  trunk
changeset: 516075:8a1bcf41e70f
user:      tacha <tacha%NetBSD.org@localhost>
date:      Mon Oct 15 05:05:43 2001 +0000

description:
If no_proxy condition is true && urltype == FTP_URL_T, use fetch_ftp to retrieve.

diffstat:

 usr.bin/ftp/fetch.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 49e913c9ed4f -r 8a1bcf41e70f usr.bin/ftp/fetch.c
--- a/usr.bin/ftp/fetch.c       Mon Oct 15 04:56:11 2001 +0000
+++ b/usr.bin/ftp/fetch.c       Mon Oct 15 05:05:43 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fetch.c,v 1.126 2001/02/19 23:03:45 cgd Exp $  */
+/*     $NetBSD: fetch.c,v 1.127 2001/10/15 05:05:43 tacha Exp $        */
 
 /*-
  * Copyright (c) 1997-2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.126 2001/02/19 23:03:45 cgd Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.127 2001/10/15 05:05:43 tacha Exp $");
 #endif /* not lint */
 
 /*
@@ -419,7 +419,7 @@
  * If proxyenv is set, use that for the proxy, otherwise try ftp_proxy or
  * http_proxy as appropriate.
  * Supports HTTP redirects.
- * Returns -1 on failure, 0 on completed xfer, 1 if ftp connection
+ * Returns 1 on failure, 0 on completed xfer, -1 if ftp connection
  * is still open (e.g, ftp xfer with trailing /)
  */
 static int
@@ -600,6 +600,10 @@
                                        }
                                }
                                FREEPTR(np_copy);
+                               if (isproxy == 0 && urltype == FTP_URL_T) {
+                                       rval = fetch_ftp(url);
+                                       goto cleanup_fetch_url;
+                               }
                        }
 
                        if (isproxy) {