Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpackURL():

Browse Source 
Make timeout mechanism's granularity always per-file (inside package)
instead of per-package (if not -v) or per-file (inside package, if -v).
This commit is contained in:
hubertf 2006-04-18 13:11:05 +00:00
parent dc9694f7fa
commit 19ef9ca981
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/pkg_install/lib/ftpio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ftpio.c,v 1.71 2006/04/11 10:36:19 hubertf Exp $ */
/* $NetBSD: ftpio.c,v 1.72 2006/04/18 13:11:05 hubertf Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#endif
#ifndef lint
__RCSID("$NetBSD: ftpio.c,v 1.71 2006/04/11 10:36:19 hubertf Exp $");
__RCSID("$NetBSD: ftpio.c,v 1.72 2006/04/18 13:11:05 hubertf Exp $");
#endif
/*-
@ -1240,11 +1240,11 @@ unpackURL(const char *url, const char *dir)
errx(EXIT_FAILURE, "don't know how to decompress %s, sorry", pkg);
/* yes, this is gross, but needed for borken ftp(1) */
(void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -%sxp -f - | tee /dev/stderr )\"\n",
(void) snprintf(cmd, sizeof(cmd), "get %s \"| ( cd %s; " TAR_CMD " %s %s -vvxp -f - | tee %s )\"\n",
pkg, dir,
decompress_cmd != NULL ? "--use-compress-program" : "",
decompress_cmd != NULL ? decompress_cmd : "",
Verbose? "vv" : "");
Verbose ? "/dev/stderr" : "/dev/null");
rc = ftp_cmd(cmd, "\n(226|550).*\n");
if (rc != 226) {