* Originally adjusted for busybox by Sven Rudolph <sr1@inf.tu-dresden.de>
* based on gzip sources
*
- * Adjusted further by Erik Andersen <andersee@debian.org> to support files as
+ * Adjusted further by Erik Andersen <andersen@codepoet.org> to support files as
* well as stdin/stdout, and to generally behave itself wrt command line
* handling.
*
* General cleanup to better adhere to the style guide and make use of standard
- * busybox functions by Glenn McGrath <bug1@optushome.com.au>
- *
+ * busybox functions by Glenn McGrath <bug1@iinet.net.au>
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <getopt.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include "busybox.h"
#include "unarchive.h"
-const char gunzip_to_stdout = 1;
-const char gunzip_force = 2;
-const char gunzip_test = 4;
+#define GUNZIP_OPT_STDOUT 1
+#define GUNZIP_OPT_FORCE 2
+#define GUNZIP_OPT_TEST 4
+#define GUNZIP_OPT_DECOMPRESS 8
-extern int gunzip_main(int argc, char **argv)
+int gunzip_main(int argc, char **argv)
{
char status = EXIT_SUCCESS;
- char flags = 0;
- int opt;
+ unsigned long opt;
+ opt = bb_getopt_ulflags(argc, argv, "cftd");
/* if called as zcat */
- if (strcmp(applet_name, "zcat") == 0) {
- flags |= gunzip_to_stdout;
- }
-
- while ((opt = getopt(argc, argv, "ctfhd")) != -1) {
- switch (opt) {
- case 'c':
- flags |= gunzip_to_stdout;
- break;
- case 'f':
- flags |= gunzip_force;
- break;
- case 't':
- flags |= gunzip_test;
- break;
- case 'd': /* Used to convert gzip to gunzip. */
- break;
- default:
- show_usage(); /* exit's inside usage */
- }
+ if (strcmp(bb_applet_name, "zcat") == 0) {
+ opt |= GUNZIP_OPT_STDOUT;
}
do {
optind++;
if (old_path == NULL || strcmp(old_path, "-") == 0) {
- src_fd = fileno(stdin);
- flags |= gunzip_to_stdout;
+ src_fd = STDIN_FILENO;
+ opt |= GUNZIP_OPT_STDOUT;
} else {
- src_fd = xopen(old_path, O_RDONLY);
+ src_fd = bb_xopen(old_path, O_RDONLY);
/* Get the time stamp on the input file. */
- if (stat(old_path, &stat_buf) < 0) {
- error_msg_and_die("Couldn't stat file %s", old_path);
- }
+ xstat(old_path, &stat_buf);
}
/* Check that the input is sane. */
- if (isatty(src_fd) && ((flags & gunzip_force) == 0)) {
- error_msg_and_die
+ if (isatty(src_fd) && ((opt & GUNZIP_OPT_FORCE) == 0)) {
+ bb_error_msg_and_die
("compressed data not read from terminal. Use -f to force it.");
}
/* Set output filename and number */
- if (flags & gunzip_test) {
- dst_fd = xopen("/dev/null", O_WRONLY); /* why does test use filenum 2 ? */
- } else if (flags & gunzip_to_stdout) {
- dst_fd = fileno(stdout);
+ if (opt & GUNZIP_OPT_TEST) {
+ dst_fd = bb_xopen(bb_dev_null, O_WRONLY); /* why does test use filenum 2 ? */
+ } else if (opt & GUNZIP_OPT_STDOUT) {
+ dst_fd = STDOUT_FILENO;
} else {
char *extension;
- new_path = xstrdup(old_path);
+ new_path = bb_xstrdup(old_path);
extension = strrchr(new_path, '.');
+#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS
+ if (extension && (strcmp(extension, ".Z") == 0)) {
+ *extension = '\0';
+ } else
+#endif
if (extension && (strcmp(extension, ".gz") == 0)) {
*extension = '\0';
} else if (extension && (strcmp(extension, ".tgz") == 0)) {
extension[2] = 'a';
extension[3] = 'r';
} else {
- error_msg_and_die("Invalid extension");
+ bb_error_msg_and_die("Invalid extension");
}
/* Open output file */
- dst_fd = xopen(new_path, O_WRONLY | O_CREAT);
+ dst_fd = bb_xopen(new_path, O_WRONLY | O_CREAT);
/* Set permissions on the file */
chmod(new_path, stat_buf.st_mode);
}
/* do the decompression, and cleanup */
- if (xread_char(src_fd) == 0x1f) {
+ if (bb_xread_char(src_fd) == 0x1f) {
unsigned char magic2;
-
- magic2 = xread_char(src_fd);
-#ifdef CONFIG_FEATURE_UNCOMPRESS
+
+ magic2 = bb_xread_char(src_fd);
+#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS
if (magic2 == 0x9d) {
- printf("uncompress\n");
- return(uncompress(src_fd, dst_fd));
- } else
+ status = uncompress(src_fd, dst_fd);
+ } else
#endif
if (magic2 == 0x8b) {
check_header_gzip(src_fd);
- status = inflate(src_fd, dst_fd);
+ status = inflate_gunzip(src_fd, dst_fd);
if (status != 0) {
- error_msg("Error inflating");
+ bb_error_msg_and_die("Error inflating");
}
- check_trailer_gzip(src_fd);
} else {
- error_msg_and_die("Invalid magic\n");
+ bb_error_msg_and_die("Invalid magic");
}
} else {
- error_msg_and_die("Invalid magic\n");
+ bb_error_msg_and_die("Invalid magic");
}
if ((status != EXIT_SUCCESS) && (new_path)) {
delete_path = new_path;
}
- if (dst_fd != fileno(stdout)) {
+ if (dst_fd != STDOUT_FILENO) {
close(dst_fd);
}
- if (src_fd != fileno(stdin)) {
+ if (src_fd != STDIN_FILENO) {
close(src_fd);
}
/* delete_path will be NULL if in test mode or from stdin */
if (delete_path && (unlink(delete_path) == -1)) {
- error_msg_and_die("Couldn't remove %s", delete_path);
+ bb_error_msg_and_die("Couldn't remove %s", delete_path);
}
free(new_path);
projects / oweals / busybox.git / blobdiff