[pkgsrc/trunk]: pkgsrc/net/libfetch libfetch-2.20:

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e87609f9abd
branches:  trunk
changeset: 549512:7e87609f9abd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Nov 04 16:14:24 2008 +0000

description:
libfetch-2.20:
Allow HTTP basic auth to be specified in the URL. Also allow : in the
password while here.

diffstat:

 net/libfetch/Makefile      |  4 ++--
 net/libfetch/files/fetch.c |  7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 6f8894ccf0a6 -r 7e87609f9abd net/libfetch/Makefile
--- a/net/libfetch/Makefile     Tue Nov 04 16:07:58 2008 +0000
+++ b/net/libfetch/Makefile     Tue Nov 04 16:14:24 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2008/10/10 22:51:41 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2008/11/04 16:14:24 joerg Exp $
 #
 
-DISTNAME=      libfetch-2.19
+DISTNAME=      libfetch-2.20
 CATEGORIES=    net
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 6f8894ccf0a6 -r 7e87609f9abd net/libfetch/files/fetch.c
--- a/net/libfetch/files/fetch.c        Tue Nov 04 16:07:58 2008 +0000
+++ b/net/libfetch/files/fetch.c        Tue Nov 04 16:14:24 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fetch.c,v 1.14 2008/10/10 22:51:41 joerg Exp $ */
+/*     $NetBSD: fetch.c,v 1.15 2008/11/04 16:14:24 joerg Exp $ */
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008 Joerg Sonnenberger <joerg%NetBSD.org@localhost>
@@ -417,7 +417,7 @@
                }
                URL += 2;
                p = URL;
-               goto find_hostname;
+               goto find_user;
        }
        if (strncmp(URL, "ftp:", 4) == 0) {
                pre_quoted = 1;
@@ -446,7 +446,7 @@
 
                /* password */
                if (*q == ':') {
-                       for (q++, i = 0; (*q != ':') && (*q != '@'); q++)
+                       for (q++, i = 0; (*q != '@'); q++)
                                if (i < URL_PWDLEN)
                                        u->pwd[i++] = *q;
                }
@@ -456,7 +456,6 @@
                p = URL;
        }
 
-find_hostname:
        /* hostname */
 #ifdef INET6
        if (*p == '[' && (q = strchr(p + 1, ']')) != NULL &&