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

gunzip'ing many files to stdout works now

Browse Source 
Fixed a missing initialisation and made a for loop more readable.
This commit is contained in:
Robert Griebl
2002-05-15 21:57:42 +00:00
parent 081df62b92
commit 7ac868460a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
archival/gunzip.c
View File

@ -75,7 +75,7 @@ static int gunzip_file (const char *path, int flags)
{ {
FILE *in_file, *out_file; FILE *in_file, *out_file;
struct stat stat_buf; struct stat stat_buf;
const char *delete_path; const char *delete_path = NULL;
char *out_path = NULL; char *out_path = NULL;
if (path == NULL || strcmp (path, "-") == 0) { if (path == NULL || strcmp (path, "-") == 0) {
@ -142,8 +142,10 @@ static int gunzip_file (const char *path, int flags)
delete_path = out_path; delete_path = out_path;
} }
fclose(out_file); if (out_file != stdout)
fclose(in_file); fclose(out_file);
if (in_file != stdin)
fclose(in_file);
if (delete_path && !(flags & gunzip_test)) { if (delete_path && !(flags & gunzip_test)) {
if (unlink(delete_path) < 0) { if (unlink(delete_path) < 0) {
@ -194,10 +196,11 @@ extern int gunzip_main(int argc, char **argv)
if (optind == argc) { if (optind == argc) {
if (gunzip_file (NULL, flags) < 0) if (gunzip_file (NULL, flags) < 0)
status = EXIT_FAILURE; status = EXIT_FAILURE;
} else } else {
for (i = optind; i < argc; i++) for (i = optind; i < argc; i++) {
if (gunzip_file (argv[i], flags) < 0) if (gunzip_file (argv[i], flags) < 0)
status = EXIT_FAILURE; status = EXIT_FAILURE;
}
}
return status; return status;
} }