X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=archival%2Fgunzip.c;h=f229ae5245ad41febb4bceb60d739b167abf182f;hb=56f16b42c93af18fbb984e8d6384c03e5405e3ae;hp=c4712270d45bbdc0a3a99badc302f5bfd3962ca4;hpb=abac53b33c6aef4f6746ef33964768d39b34e67c;p=oweals%2Fbusybox.git

diff --git a/archival/gunzip.c b/archival/gunzip.c
index c4712270d..f229ae524 100644
--- a/archival/gunzip.c
+++ b/archival/gunzip.c
@@ -7,7 +7,7 @@
  * 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.
  *
@@ -64,7 +64,12 @@ static char *license_msg[] = {
 #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;
@@ -77,7 +82,7 @@ extern int gunzip_main(int argc, char **argv)
 	int opt;
 
 	/* if called as zcat */
-	if (strcmp(applet_name, "zcat") == 0) {
+	if (strcmp(bb_applet_name, "zcat") == 0) {
 		flags |= gunzip_to_stdout;
 	}
 
@@ -95,87 +100,111 @@ extern int gunzip_main(int argc, char **argv)
 		case 'd':		/* Used to convert gzip to gunzip. */
 			break;
 		default:
-			show_usage();	/* exit's inside usage */
+			bb_show_usage();	/* exit's inside usage */
 		}
 	}
 
 	do {
-		FILE *in_file, *out_file;
 		struct stat stat_buf;
 		const char *old_path = argv[optind];
 		const char *delete_path = NULL;
 		char *new_path = NULL;
+		int src_fd;
+		int dst_fd;
 
 		optind++;
 
 		if (old_path == NULL || strcmp(old_path, "-") == 0) {
-			in_file = stdin;
+			src_fd = fileno(stdin);
 			flags |= gunzip_to_stdout;
 		} else {
-			in_file = wfopen(old_path, "r");
-			if (in_file == NULL) {
-				status = EXIT_FAILURE;
-				break;
-			}
+			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);
+				bb_error_msg_and_die("Couldn't stat file %s", old_path);
 			}
 		}
 
 		/* Check that the input is sane.  */
-		if (isatty(fileno(in_file)) && ((flags & gunzip_force) == 0)) {
-			error_msg_and_die
+		if (isatty(src_fd) && ((flags & gunzip_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) {
-			out_file = xfopen("/dev/null", "w");	/* why does test use filenum 2 ? */
+			dst_fd = bb_xopen("/dev/null", O_WRONLY);	/* why does test use filenum 2 ? */
 		} else if (flags & gunzip_to_stdout) {
-			out_file = stdout;
+			dst_fd = fileno(stdout);
 		} 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 */
-			out_file = xfopen(new_path, "w");
+			dst_fd = bb_xopen(new_path, O_WRONLY | O_CREAT);
 
 			/* Set permissions on the file */
-			chmod(old_path, stat_buf.st_mode);
+			chmod(new_path, stat_buf.st_mode);
 
 			/* If unzip succeeds remove the old file */
 			delete_path = old_path;
 		}
 
 		/* do the decompression, and cleanup */
-		if ((unzip(in_file, out_file) != 0) && (new_path)) {
+		if (bb_xread_char(src_fd) == 0x1f) {
+			unsigned char magic2;
+			
+			magic2 = bb_xread_char(src_fd);
+#ifdef CONFIG_FEATURE_GUNZIP_UNCOMPRESS
+			if (magic2 == 0x9d) {
+				status = uncompress(src_fd, dst_fd);
+			} else 
+#endif
+				if (magic2 == 0x8b) {
+					check_header_gzip(src_fd);
+					status = inflate_gunzip(src_fd, dst_fd);
+					if (status != 0) {
+						bb_error_msg_and_die("Error inflating");
+					}
+				} else {
+					bb_error_msg_and_die("Invalid magic");
+				}
+		} else {
+			bb_error_msg_and_die("Invalid magic");
+		}
+
+		if ((status != EXIT_SUCCESS) && (new_path)) {
 			/* Unzip failed, remove new path instead of old path */
 			delete_path = new_path;
 		}
 
-		if (out_file != stdout) {
-			fclose(out_file);
+		if (dst_fd != fileno(stdout)) {
+			close(dst_fd);
 		}
-		if (in_file != stdin) {
-			fclose(in_file);
+		if (src_fd != fileno(stdin)) {
+			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);