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

Run through indent, use braces

Browse Source
This commit is contained in:
Glenn L McGrath 2002-08-24 10:30:36 +00:00
parent 933d10d308
commit 1ee52e8b14
1 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
archival/gunzip.c
View File

@ -71,20 +71,20 @@ const int gunzip_force = 2;
const int gunzip_test = 4; const int gunzip_test = 4;
const int gunzip_verbose = 8; const int gunzip_verbose = 8;
static int gunzip_file (const char *path, int flags) 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 = NULL; 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) {
in_file = stdin; in_file = stdin;
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
} else { } else {
if ((in_file = wfopen(path, "r")) == NULL) if ((in_file = wfopen(path, "r")) == NULL) {
return -1; return -1;
}
if (flags & gunzip_verbose) { if (flags & gunzip_verbose) {
fprintf(stderr, "%s:\t", path); fprintf(stderr, "%s:\t", path);
} }
@ -99,8 +99,10 @@ static int gunzip_file (const char *path, int flags)
} }
/* Check that the input is sane. */ /* Check that the input is sane. */
if (isatty(fileno(in_file)) && (flags & gunzip_force) == 0) if (isatty(fileno(in_file)) && (flags & gunzip_force) == 0) {
error_msg_and_die("compressed data not read from terminal. Use -f to force it."); error_msg_and_die
("compressed data not read from terminal. Use -f to force it.");
}
/* Set output filename and number */ /* Set output filename and number */
if (flags & gunzip_test) { if (flags & gunzip_test) {
@ -131,8 +133,9 @@ static int gunzip_file (const char *path, int flags)
/* do the decompression, and cleanup */ /* do the decompression, and cleanup */
if (unzip(in_file, out_file) == 0) { if (unzip(in_file, out_file) == 0) {
/* Success, remove .gz file */ /* Success, remove .gz file */
if ( !(flags & gunzip_to_stdout )) if (!(flags & gunzip_to_stdout)) {
delete_path = path; delete_path = path;
}
if (flags & gunzip_verbose) { if (flags & gunzip_verbose) {
fprintf(stderr, "OK\n"); fprintf(stderr, "OK\n");
} }
@ -141,10 +144,12 @@ static int gunzip_file (const char *path, int flags)
delete_path = out_path; delete_path = out_path;
} }
if (out_file != stdout) if (out_file != stdout) {
fclose(out_file); fclose(out_file);
if (in_file != stdin) }
if (in_file != stdin) {
fclose(in_file); 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) {
@ -164,8 +169,9 @@ extern int gunzip_main(int argc, char **argv)
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
/* if called as zcat */ /* if called as zcat */
if (strcmp(applet_name, "zcat") == 0) if (strcmp(applet_name, "zcat") == 0) {
flags |= gunzip_to_stdout; flags |= gunzip_to_stdout;
}
while ((opt = getopt(argc, argv, "ctfhdqv")) != -1) { while ((opt = getopt(argc, argv, "ctfhdqv")) != -1) {
switch (opt) { switch (opt) {
@ -193,13 +199,15 @@ 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;
} }