system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-02 14:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include value of command line argument that causes an error message or

Browse source 
warning in said message, since fetch may be run from a makefile or script
which does not print the command line.

Approved by:	des
This commit is contained in:
Stefan Eßer 2001-07-28 21:34:56 +00:00
parent 73b3e4df87
commit 6d64e93980
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=80521
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
usr.bin/fetch/fetch.c
View file

@ -1,3 +1,4 @@
/*-
* Copyright (c) 2000 Dag-Erling Coïdan Smørgrav
* All rights reserved.
@ -597,7 +598,7 @@ main(int argc, char *argv[])
break;
case 'B':
if (parseoff(optarg, &B_size) == -1)
errx(1, "invalid buffer size");
errx(1, "invalid buffer size (%s)", optarg);
break;
case 'b':
warnx("warning: the -b option is deprecated");
@ -657,14 +658,14 @@ main(int argc, char *argv[])
break;
case 'S':
if (parseoff(optarg, &S_size) == -1)
errx(1, "invalid size");
errx(1, "invalid size (%s)", optarg);
break;
case 's':
s_flag = 1;
break;
case 'T':
if (parseint(optarg, &T_secs) == -1)
errx(1, "invalid timeout");
errx(1, "invalid timeout (%s)", optarg);
break;
case 't':
t_flag = 1;
@ -679,7 +680,7 @@ main(int argc, char *argv[])
case 'w':
a_flag = 1;
if (parseint(optarg, &w_secs) == -1)
errx(1, "invalid delay");
errx(1, "invalid delay (%s)", optarg);
break;
default:
usage();
@ -717,13 +718,15 @@ main(int argc, char *argv[])
/* timeouts */
if ((s = getenv("FTP_TIMEOUT")) != NULL) {
if (parseint(s, &ftp_timeout) == -1) {
warnx("FTP_TIMEOUT is not a positive integer");
warnx("FTP_TIMEOUT (%s) is not a positive integer",
optarg);
ftp_timeout = 0;
}
}
if ((s = getenv("HTTP_TIMEOUT")) != NULL) {
if (parseint(s, &http_timeout) == -1) {
warnx("HTTP_TIMEOUT is not a positive integer");
warnx("HTTP_TIMEOUT (%s) is not a positive integer",
optarg);
http_timeout = 0;
}
}