Fix behavior when extracting to stdout. Report and patch by
Evin Robertson <nitfol@my-deja.com>.
This commit is contained in:
parent
ed897e5415
commit
65317ea27f
@ -141,7 +141,7 @@ int wget_main(int argc, char **argv)
|
|||||||
* this gets interpreted as the auto-gen output filename
|
* this gets interpreted as the auto-gen output filename
|
||||||
* case below - tausq@debian.org
|
* case below - tausq@debian.org
|
||||||
*/
|
*/
|
||||||
fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
|
fname_out = optarg;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
show_usage();
|
show_usage();
|
||||||
@ -188,10 +188,10 @@ int wget_main(int argc, char **argv)
|
|||||||
/*
|
/*
|
||||||
* Open the output file stream.
|
* Open the output file stream.
|
||||||
*/
|
*/
|
||||||
if (fname_out != (char *)1) {
|
if (strcmp(fname_out, "-") == 0) {
|
||||||
output = xfopen( fname_out, (do_continue ? "a" : "w") );
|
|
||||||
} else {
|
|
||||||
output = stdout;
|
output = stdout;
|
||||||
|
} else {
|
||||||
|
output = xfopen(fname_out, (do_continue ? "a" : "w"));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -732,7 +732,7 @@ progressmeter(int flag)
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: wget.c,v 1.32 2001/04/10 18:17:05 andersen Exp $
|
* $Id: wget.c,v 1.33 2001/04/11 20:03:01 kraai Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
10
wget.c
10
wget.c
@ -141,7 +141,7 @@ int wget_main(int argc, char **argv)
|
|||||||
* this gets interpreted as the auto-gen output filename
|
* this gets interpreted as the auto-gen output filename
|
||||||
* case below - tausq@debian.org
|
* case below - tausq@debian.org
|
||||||
*/
|
*/
|
||||||
fname_out = (strcmp(optarg, "-") == 0 ? (char *)1 : optarg);
|
fname_out = optarg;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
show_usage();
|
show_usage();
|
||||||
@ -188,10 +188,10 @@ int wget_main(int argc, char **argv)
|
|||||||
/*
|
/*
|
||||||
* Open the output file stream.
|
* Open the output file stream.
|
||||||
*/
|
*/
|
||||||
if (fname_out != (char *)1) {
|
if (strcmp(fname_out, "-") == 0) {
|
||||||
output = xfopen( fname_out, (do_continue ? "a" : "w") );
|
|
||||||
} else {
|
|
||||||
output = stdout;
|
output = stdout;
|
||||||
|
} else {
|
||||||
|
output = xfopen(fname_out, (do_continue ? "a" : "w"));
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -732,7 +732,7 @@ progressmeter(int flag)
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: wget.c,v 1.32 2001/04/10 18:17:05 andersen Exp $
|
* $Id: wget.c,v 1.33 2001/04/11 20:03:01 kraai Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user