aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/lukemftp/src/fetch.c
diff options
context:
space:
mode:
authorMike Heffner <mikeh@FreeBSD.org>2004-04-27 00:31:36 +0000
committerMike Heffner <mikeh@FreeBSD.org>2004-04-27 00:31:36 +0000
commit7e475d60f53f104292ac3b1c0015eeb52678c424 (patch)
tree80713a30b46e815ba6ac317d444160c8eea2f79e /contrib/lukemftp/src/fetch.c
parent0e54ef8be7e8aae6d1a1919f34d62ef4a6222e67 (diff)
downloadsrc-7e475d60f53f104292ac3b1c0015eeb52678c424.tar.gz
src-7e475d60f53f104292ac3b1c0015eeb52678c424.zip
Import the latest (4/26/04) CVS lukemftp. This adds the ability to
have a prefix string on the progressbar and brings in a patch by mux@ to fix the condition when connect() returns EINTR. Requested by: mux
Notes
Notes: svn path=/vendor/lukemftp/dist/; revision=128671
Diffstat (limited to 'contrib/lukemftp/src/fetch.c')
-rw-r--r--contrib/lukemftp/src/fetch.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/contrib/lukemftp/src/fetch.c b/contrib/lukemftp/src/fetch.c
index c17a051e4001..abb89ce15946 100644
--- a/contrib/lukemftp/src/fetch.c
+++ b/contrib/lukemftp/src/fetch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $ */
+/* $NetBSD: fetch.c,v 1.146 2003/12/10 12:34:28 lukem Exp $ */
/*-
* Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.146 2003/12/10 12:34:28 lukem Exp $");
#endif /* not lint */
/*
@@ -246,7 +246,7 @@ url_decode(char *url)
/*
* Parse URL of form:
- * <type>://[<user>[:<password>@]]<host>[:<port>][/<path>]
+ * <type>://[<user>[:<password>]@]<host>[:<port>][/<path>]
* Returns -1 if a parse error occurred, otherwise 0.
* It's the caller's responsibility to url_decode() the returned
* user, pass and path.
@@ -1303,7 +1303,6 @@ fetch_ftp(const char *url)
if ((parse_url(url, "URL", &urltype, &user, &pass,
&host, &port, &portnum, &path) == -1) ||
(user != NULL && *user == '\0') ||
- (pass != NULL && *pass == '\0') ||
EMPTYSTRING(host)) {
warnx("Invalid URL `%s'", url);
goto cleanup_fetch_ftp;