diff options
| author | des <des@FreeBSD.org> | 2009-01-17 13:34:56 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-01-17 13:34:56 +0000 |
| commit | 52e26e275d96cefda75a363a6fd4519270b75e5b (patch) | |
| tree | 384df952271a289baefb3896c9a5d78cc8bb118c /usr.bin | |
| parent | a0ad11199f569d75bdad57b8e31afd3da702fbd5 (diff) | |
| download | FreeBSD-src-52e26e275d96cefda75a363a6fd4519270b75e5b.zip FreeBSD-src-52e26e275d96cefda75a363a6fd4519270b75e5b.tar.gz | |
The FTP_TIMEOUT and HTTP_TIMEOUT environment variables were ignored because
T_secs already had a non-zero default. Unbreak by moving the default to
ftp_timeout / http_timeout.
Submitted by: Christoph Mallon <christoph.mallon@gmx.de>
MFC after: 2 weeks
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/fetch/fetch.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index bc5268c..2512a2e 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <fetch.h> #define MINBUFSIZE 4096 +#define TIMEOUT 120 /* Option flags */ int A_flag; /* -A: do not follow 302 redirects */ @@ -75,7 +76,7 @@ int R_flag; /* -R: don't delete partially transferred files */ int r_flag; /* -r: restart previously interrupted transfer */ off_t S_size; /* -S: require size to match */ int s_flag; /* -s: show size, don't fetch */ -long T_secs = 120; /* -T: transfer timeout in seconds */ +long T_secs; /* -T: transfer timeout in seconds */ int t_flag; /*! -t: workaround TCP bug */ int U_flag; /* -U: do not use high ports */ int v_level = 1; /* -v: verbosity level */ @@ -88,8 +89,8 @@ int sigalrm; /* SIGALRM received */ int siginfo; /* SIGINFO received */ int sigint; /* SIGINT received */ -long ftp_timeout; /* default timeout for FTP transfers */ -long http_timeout; /* default timeout for HTTP transfers */ +long ftp_timeout = TIMEOUT; /* default timeout for FTP transfers */ +long http_timeout = TIMEOUT; /* default timeout for HTTP transfers */ char *buf; /* transfer buffer */ |
