cf32ac543
Matt Kraai
2002-03-27
Subject
* archival/bunzip2.c (bunzip2_main): Remove compressed file. * testsuite/bunzip2/bunzip2-removes-compressed-file: New.
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
archival/bunzip2.c+19 -2
| @@ -2323,10 +2323,12 @@ int bunzip2_main(int argc, char **argv) | |
| const int bunzip_force = 2; | |
| int flags = 0; | |
| int opt = 0; | |
| + | int status; |
| FILE *src_stream; | |
| FILE *dst_stream; | |
| char *save_name = NULL; | |
| + | char *delete_name = NULL; |
| /* if called as bzcat */ | |
| if (strcmp(applet_name, "bzcat") == 0) | |
| @@ -2369,7 +2371,22 @@ int bunzip2_main(int argc, char **argv) | |
| } else { | |
| dst_stream = xfopen(save_name, "w"); | |
| } | |
| - | uncompressStream(src_stream, dst_stream); |
| - | return(TRUE); |
| + | if (uncompressStream(src_stream, dst_stream)) { |
| + | if (save_name != NULL) |
| + | delete_name = argv[optind]; |
| + | status = EXIT_SUCCESS; |
| + | } else { |
| + | if (save_name != NULL) |
| + | delete_name = save_name; |
| + | status = EXIT_FAILURE; |
| + | } |
| + | |
| + | if (delete_name) { |
| + | if (unlink(delete_name) < 0) { |
| + | error_msg_and_die("Couldn't remove %s", delete_name); |
| + | } |
| + | } |
| + | |
| + | return status; |
| } | |
testsuite/bunzip2/bunzip2-removes-compressed-file+3 -0
| @@ -0,0 +1,3 @@ | |
| + | echo foo | bzip2 >foo.bz2 |
| + | busybox bunzip2 foo.bz2 |
| + | test ! -f foo.bz2 |