emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wget: -O - still outputs progressbar (to stderr)

Browse Source 
Noticed dead code. -100 bytes.
This commit is contained in:
Denis Vlasenko 2006-11-23 13:10:23 +00:00
parent c90c3f30a8
commit 4e4662cc73
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
networking/wget.c
View File

@ -210,17 +210,18 @@ int wget_main(int argc, char **argv)
curfile = bb_get_last_path_component(fname_out); curfile = bb_get_last_path_component(fname_out);
#endif #endif
} }
/* Impossible?
if ((opt & WGET_OPT_CONTINUE) && !fname_out) if ((opt & WGET_OPT_CONTINUE) && !fname_out)
bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); bb_error_msg_and_die("cannot specify continue (-c) without a filename (-O)"); */
/* /*
* Determine where to start transfer. * Determine where to start transfer.
*/ */
if (!strcmp(fname_out, "-")) { if (fname_out[0] == '-' && !fname_out[1]) {
output_fd = 1; output_fd = 1;
opt |= WGET_OPT_QUIET;
opt &= ~WGET_OPT_CONTINUE; opt &= ~WGET_OPT_CONTINUE;
} else if (opt & WGET_OPT_CONTINUE) { }
if (opt & WGET_OPT_CONTINUE) {
output_fd = open(fname_out, O_WRONLY); output_fd = open(fname_out, O_WRONLY);
if (output_fd >= 0) { if (output_fd >= 0) {
beg_range = xlseek(output_fd, 0, SEEK_END); beg_range = xlseek(output_fd, 0, SEEK_END);
@ -235,7 +236,7 @@ int wget_main(int argc, char **argv)
bb_lookup_host(&s_in, server.host); bb_lookup_host(&s_in, server.host);
s_in.sin_port = server.port; s_in.sin_port = server.port;
if (!(opt & WGET_OPT_QUIET)) { if (!(opt & WGET_OPT_QUIET)) {
printf("Connecting to %s[%s]:%d\n", fprintf(stderr, "Connecting to %s[%s]:%d\n",
server.host, inet_ntoa(s_in.sin_addr), ntohs(server.port)); server.host, inet_ntoa(s_in.sin_addr), ntohs(server.port));
} }