diff options
| author | joerg <joerg> | 2008-04-21 13:09:57 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-04-21 13:09:57 +0000 |
| commit | c5007afd46fd74d4d9c5bdbab0f1cddc453779d9 (patch) | |
| tree | 1f5d186ac1dd5902a8c15ffb7ef8692fa8ae7033 /net/libfetch | |
| parent | 3b2fcd11c7fa96bbbc40937a156ce621d49f4dee (diff) | |
| download | pkgsrc-c5007afd46fd74d4d9c5bdbab0f1cddc453779d9.tar.gz | |
libfetch-2.8:
Fix a number of small bugs introduced in the last version.
Diffstat (limited to 'net/libfetch')
| -rw-r--r-- | net/libfetch/Makefile | 4 | ||||
| -rw-r--r-- | net/libfetch/files/file.c | 5 | ||||
| -rw-r--r-- | net/libfetch/files/ftp.c | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/net/libfetch/Makefile b/net/libfetch/Makefile index 7dc5c253c98..1f0b114ce7d 100644 --- a/net/libfetch/Makefile +++ b/net/libfetch/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2008/04/20 15:29:26 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2008/04/21 13:09:57 joerg Exp $ # -DISTNAME= libfetch-2.7 +DISTNAME= libfetch-2.8 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty diff --git a/net/libfetch/files/file.c b/net/libfetch/files/file.c index a580e48c16e..69381dd6ee2 100644 --- a/net/libfetch/files/file.c +++ b/net/libfetch/files/file.c @@ -1,4 +1,4 @@ -/* $NetBSD: file.c,v 1.6 2008/04/19 14:49:23 joerg Exp $ */ +/* $NetBSD: file.c,v 1.7 2008/04/21 13:09:57 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. @@ -200,7 +200,6 @@ fetchListFile(struct url_list *ue, struct url *u, const char *pattern, const cha return -1; } - ue = NULL; strncpy(fn, u->doc, sizeof(fn) - 2); fn[sizeof(fn) - 2] = 0; strcat(fn, "/"); @@ -208,7 +207,7 @@ fetchListFile(struct url_list *ue, struct url *u, const char *pattern, const cha l = sizeof(fn) - strlen(fn) - 1; while ((de = readdir(dir)) != NULL) { - if (fnmatch(pattern, de->d_name, 0) != 0) + if (pattern && fnmatch(pattern, de->d_name, 0) != 0) continue; strncpy(p, de->d_name, l - 1); p[l - 1] = 0; diff --git a/net/libfetch/files/ftp.c b/net/libfetch/files/ftp.c index 1a7c203ff62..988a7011aee 100644 --- a/net/libfetch/files/ftp.c +++ b/net/libfetch/files/ftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.18 2008/04/19 14:49:23 joerg Exp $ */ +/* $NetBSD: ftp.c,v 1.19 2008/04/21 13:09:57 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org> @@ -1207,7 +1207,6 @@ fetchListFTP(struct url_list *ue, struct url *url, const char *pattern, const ch if (f == NULL) return -1; - ue = NULL; cur_off = 0; while ((len = fetchIO_read(f, buf + cur_off, sizeof(buf) - cur_off)) > 0) { cur_off += len; |