Bug fix for wget, and proper attribution of Chip Rosenthal and
Covad Communications for the contribution of wget.
-Erik
diff --git a/networking/wget.c b/networking/wget.c
index 4f894fc..c06e76d 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -50,7 +50,7 @@
++do_continue;
break;
case 'O':
- fname_out = optarg;
+ fname_out = (strcmp(optarg, "-") == 0 ? NULL : optarg);
break;
default:
usage(wget_usage);
@@ -74,12 +74,8 @@
* Open the output stream.
*/
if (fname_out != NULL) {
- /* Check if the file is supposed to go to stdout */
- if (!strcmp(fname_out, "-") == 0) {
- /* Nope -- so open the output file */
- if (freopen(fname_out, (do_continue ? "a" : "w"), stdout) == NULL)
- fatalError("wget: freopen(%s): %s\n", fname_out, strerror(errno));
- }
+ if (freopen(fname_out, (do_continue ? "a" : "w"), stdout) == NULL)
+ fatalError("wget: freopen(%s): %s\n", fname_out, strerror(errno));
}
/*
@@ -248,7 +244,7 @@
return hdrval;
}
- /* Rat! The buffer isn't big enough to hold the entire header value. */
+ /* Rats! The buffer isn't big enough to hold the entire header value. */
while (c = getc(fp), c != EOF && c != '\n')
;
*istrunc = 1;