From a41011ddfbea7c7e6fac719767f5fd49b0bddc34 Mon Sep 17 00:00:00 2001 From: joerg Date: Sat, 5 Apr 2008 02:51:14 +0000 Subject: Actually return the list, not print it. --- net/libfetch/files/ftp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'net/libfetch/files/ftp.c') diff --git a/net/libfetch/files/ftp.c b/net/libfetch/files/ftp.c index 59de42f2d67..7413362c23d 100644 --- a/net/libfetch/files/ftp.c +++ b/net/libfetch/files/ftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.13 2008/04/05 02:42:13 joerg Exp $ */ +/* $NetBSD: ftp.c,v 1.14 2008/04/05 02:51:14 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. @@ -1190,6 +1190,7 @@ fetchFilteredListFTP(struct url *url, const char *pattern, const char *flags) char buf[2 * PATH_MAX], *eol, *eos; ssize_t len; size_t cur_off; + int list_size, list_len; /* XXX What about proxies? */ f = ftp_request(url, "NLST", pattern, NULL, ftp_get_proxy(url, flags), flags); @@ -1208,8 +1209,8 @@ fetchFilteredListFTP(struct url *url, const char *pattern, const char *flags) eos = eol - 1; else eos = eol; - fwrite(buf, eos - buf, 1, stdout); - puts(""); + *eos = '\0'; + fetch_add_entry(&ue, &list_size, &list_len, buf, NULL); cur_off -= eol - buf + 1; memmove(buf, eol + 1, cur_off); } @@ -1222,7 +1223,7 @@ fetchFilteredListFTP(struct url *url, const char *pattern, const char *flags) return NULL; } fetchIO_close(f); - return (NULL); + return ue; } /* -- cgit v1.2.3