aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-01-31 17:49:47 +0000
committerEric Andersen <andersen@codepoet.org>2001-01-31 17:49:47 +0000
commit79e898ac0e46d658f7edcbcb48e5bd0d578b6380 (patch)
treea90bab57b13080eb61e775bc72547ed72227370c
parent65225df2dc656d3c038b22e82b2865c1db333cb2 (diff)
downloadbusybox-w32-79e898ac0e46d658f7edcbcb48e5bd0d578b6380.tar.gz
busybox-w32-79e898ac0e46d658f7edcbcb48e5bd0d578b6380.tar.bz2
busybox-w32-79e898ac0e46d658f7edcbcb48e5bd0d578b6380.zip
Patch from Vladimir N. Oleynik to simplify wget file opening
using xfopen (which is what everything should be using).
-rw-r--r--networking/wget.c5
-rw-r--r--wget.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/networking/wget.c b/networking/wget.c
index 438ecba2e..729c6fdc7 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -167,8 +167,7 @@ int wget_main(int argc, char **argv)
167 * Open the output file stream. 167 * Open the output file stream.
168 */ 168 */
169 if (fname_out != (char *)1) { 169 if (fname_out != (char *)1) {
170 if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) == NULL) 170 output = xfopen( fname_out, (do_continue ? "a" : "w") );
171 perror_msg_and_die("fopen(%s)", fname_out);
172 } else { 171 } else {
173 output = stdout; 172 output = stdout;
174 } 173 }
@@ -533,7 +532,7 @@ progressmeter(int flag)
533 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 532 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
534 * SUCH DAMAGE. 533 * SUCH DAMAGE.
535 * 534 *
536 * $Id: wget.c,v 1.23 2001/01/27 08:24:38 andersen Exp $ 535 * $Id: wget.c,v 1.24 2001/01/31 17:49:47 andersen Exp $
537 */ 536 */
538 537
539 538
diff --git a/wget.c b/wget.c
index 438ecba2e..729c6fdc7 100644
--- a/wget.c
+++ b/wget.c
@@ -167,8 +167,7 @@ int wget_main(int argc, char **argv)
167 * Open the output file stream. 167 * Open the output file stream.
168 */ 168 */
169 if (fname_out != (char *)1) { 169 if (fname_out != (char *)1) {
170 if ( (output=fopen(fname_out, (do_continue ? "a" : "w"))) == NULL) 170 output = xfopen( fname_out, (do_continue ? "a" : "w") );
171 perror_msg_and_die("fopen(%s)", fname_out);
172 } else { 171 } else {
173 output = stdout; 172 output = stdout;
174 } 173 }
@@ -533,7 +532,7 @@ progressmeter(int flag)
533 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 532 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
534 * SUCH DAMAGE. 533 * SUCH DAMAGE.
535 * 534 *
536 * $Id: wget.c,v 1.23 2001/01/27 08:24:38 andersen Exp $ 535 * $Id: wget.c,v 1.24 2001/01/31 17:49:47 andersen Exp $
537 */ 536 */
538 537
539 538