Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/archival/bbunzip.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/archival/bbunzip.c (modified) (15 diffs)

branches/2.2.9/mindi-busybox/archival/bbunzip.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  Common code for gunzip-like applets
- *
- *  Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
+ * Common code for gunzip-like applets
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
 enum {
-    OPT_STDOUT = 0x1,
-    OPT_FORCE = 0x2,
-/* gunzip only: */
-    OPT_VERBOSE = 0x4,
-    OPT_DECOMPRESS = 0x8,
-    OPT_TEST = 0x10,
+    OPT_STDOUT     = 1 << 0,
+    OPT_FORCE      = 1 << 1,
+    /* only some decompressors: */
+    OPT_VERBOSE    = 1 << 2,
+    OPT_DECOMPRESS = 1 << 3,
+    OPT_TEST       = 1 << 4,
 };
 
@@ -29 +28 @@
 }
 
-int bbunpack(char **argv,
-    char* (*make_new_name)(char *filename),
-    USE_DESKTOP(long long) int (*unpacker)(void)
+char* FAST_FUNC append_ext(char *filename, const char *expected_ext)
+{
+    return xasprintf("%s.%s", filename, expected_ext);
+}
+
+int FAST_FUNC bbunpack(char **argv,
+    IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(unpack_info_t *info),
+    char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
+    const char *expected_ext
 )
 {
     struct stat stat_buf;
-    USE_DESKTOP(long long) int status;
+    IF_DESKTOP(long long) int status;
     char *filename, *new_name;
     smallint exitcode = 0;
+    unpack_info_t info;
 
     do {
@@ -50 +56 @@
         if (filename) {
             if (stat(filename, &stat_buf) != 0) {
-                bb_perror_msg("%s", filename);
+                bb_simple_perror_msg(filename);
  err:
                 exitcode = 1;
@@ -69 +75 @@
         /* Open dst if we are going to unpack to file */
         if (filename) {
-            new_name = make_new_name(filename);
+            new_name = make_new_name(filename, expected_ext);
             if (!new_name) {
                 bb_error_msg("%s: unknown suffix - ignored", filename);
                 goto err;
             }
+
+            /* -f: overwrite existing output files */
+            if (option_mask32 & OPT_FORCE) {
+                unlink(new_name);
+            }
+
             /* O_EXCL: "real" bunzip2 doesn't overwrite files */
-            /* GNU gunzip goes not bail out, but goes to next file */
+            /* GNU gunzip does not bail out, but goes to next file */
             if (open_to_or_warn(STDOUT_FILENO, new_name, O_WRONLY | O_CREAT | O_EXCL,
                     stat_buf.st_mode))
@@ -87 +99 @@
         }
 
-        status = unpacker();
+        /* memset(&info, 0, sizeof(info)); */
+        info.mtime = 0; /* so far it has one member only */
+        status = unpacker(&info);
         if (status < 0)
             exitcode = 1;
+        xclose(STDOUT_FILENO); /* with error check! */
 
         if (filename) {
             char *del = new_name;
             if (status >= 0) {
-                /* TODO: restore user/group/times here? */
+                /* TODO: restore other things? */
+                if (info.mtime) {
+                    struct timeval times[2];
+
+                    times[1].tv_sec = times[0].tv_sec = info.mtime;
+                    times[1].tv_usec = times[0].tv_usec = 0;
+                    /* Note: we closed it first.
+                     * On some systems calling utimes
+                     * then closing resets the mtime
+                     * back to current time. */
+                    utimes(new_name, times); /* ignoring errors */
+                }
+
                 /* Delete _compressed_ file */
                 del = filename;
@@ -120 +147 @@
 }
 
-#if ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNCOMPRESS
-
-static
-char* make_new_name_generic(char *filename, const char *expected_ext)
+#if ENABLE_UNCOMPRESS || ENABLE_BUNZIP2 || ENABLE_UNLZMA || ENABLE_UNXZ
+static
+char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 {
     char *extension = strrchr(filename, '.');
@@ -134 +160 @@
     return filename;
 }
-
-#endif
-
-
-/*
- *  Modified for busybox by Glenn McGrath <bug1@iinet.net.au>
- *  Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
- *
- *  Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#if ENABLE_BUNZIP2
-
-static
-char* make_new_name_bunzip2(char *filename)
-{
-    return make_new_name_generic(filename, "bz2");
-}
-
-static
-USE_DESKTOP(long long) int unpack_bunzip2(void)
-{
-    return unpack_bz2_stream(STDIN_FILENO, STDOUT_FILENO);
-}
-
-int bunzip2_main(int argc, char **argv);
-int bunzip2_main(int argc, char **argv)
+#endif
+
+
+/*
+ * Uncompress applet for busybox (c) 2002 Glenn McGrath
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#if ENABLE_UNCOMPRESS
+static
+IF_DESKTOP(long long) int FAST_FUNC unpack_uncompress(unpack_info_t *info UNUSED_PARAM)
+{
+    IF_DESKTOP(long long) int status = -1;
+
+    if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) {
+        bb_error_msg("invalid magic");
+    } else {
+        status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO);
+    }
+    return status;
+}
+int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int uncompress_main(int argc UNUSED_PARAM, char **argv)
 {
     getopt32(argv, "cf");
     argv += optind;
-    if (applet_name[2] == 'c')
-        option_mask32 |= OPT_STDOUT;
-
-    return bbunpack(argv, make_new_name_bunzip2, unpack_bunzip2);
-}
-
+
+    return bbunpack(argv, unpack_uncompress, make_new_name_generic, "Z");
+}
 #endif
 
@@ -186 +205 @@
  *
  * General cleanup to better adhere to the style guide and make use of standard
- * busybox functions by Glenn McGrath <bug1@iinet.net.au>
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * busybox functions by Glenn McGrath
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
@@ -200 +219 @@
  * See the file algorithm.doc for the compression algorithms and file formats.
  */
-
 #if ENABLE_GUNZIP
-
-static
-char* make_new_name_gunzip(char *filename)
+static
+char* FAST_FUNC make_new_name_gunzip(char *filename, const char *expected_ext UNUSED_PARAM)
 {
     char *extension = strrchr(filename, '.');
@@ -213 +230 @@
     extension++;
     if (strcmp(extension, "tgz" + 1) == 0
-#if ENABLE_FEATURE_GUNZIP_UNCOMPRESS
-     || strcmp(extension, "Z") == 0
+#if ENABLE_FEATURE_SEAMLESS_Z
+     || (extension[0] == 'Z' && extension[1] == '\0')
 #endif
     ) {
@@ -228 +245 @@
     return filename;
 }
-
-static
-USE_DESKTOP(long long) int unpack_gunzip(void)
-{
-    USE_DESKTOP(long long) int status = -1;
+static
+IF_DESKTOP(long long) int FAST_FUNC unpack_gunzip(unpack_info_t *info)
+{
+    IF_DESKTOP(long long) int status = -1;
 
     /* do the decompression, and cleanup */
@@ -239 +255 @@
 
         magic2 = xread_char(STDIN_FILENO);
-        if (ENABLE_FEATURE_GUNZIP_UNCOMPRESS && magic2 == 0x9d) {
-            status = uncompress(STDIN_FILENO, STDOUT_FILENO);
+        if (ENABLE_FEATURE_SEAMLESS_Z && magic2 == 0x9d) {
+            status = unpack_Z_stream(STDIN_FILENO, STDOUT_FILENO);
         } else if (magic2 == 0x8b) {
-            check_header_gzip_or_die(STDIN_FILENO);
-            status = unpack_gz_stream(STDIN_FILENO, STDOUT_FILENO);
+            status = unpack_gz_stream_with_info(STDIN_FILENO, STDOUT_FILENO, info);
         } else {
             goto bad_magic;
@@ -257 +272 @@
     return status;
 }
-
-int gunzip_main(int argc, char **argv);
-int gunzip_main(int argc, char **argv)
-{
-    getopt32(argv, "cfvdt");
+/*
+ * Linux kernel build uses gzip -d -n. We accept and ignore it.
+ * Man page says:
+ * -n --no-name
+ * gzip: do not save the original file name and time stamp.
+ * (The original name is always saved if the name had to be truncated.)
+ * gunzip: do not restore the original file name/time even if present
+ * (remove only the gzip suffix from the compressed file name).
+ * This option is the default when decompressing.
+ * -N --name
+ * gzip: always save the original file name and time stamp (this is the default)
+ * gunzip: restore the original file name and time stamp if present.
+ */
+int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int gunzip_main(int argc UNUSED_PARAM, char **argv)
+{
+    getopt32(argv, "cfvdtn");
     argv += optind;
     /* if called as zcat */
@@ -267 +294 @@
         option_mask32 |= OPT_STDOUT;
 
-    return bbunpack(argv, make_new_name_gunzip, unpack_gunzip);
-}
-
+    return bbunpack(argv, unpack_gunzip, make_new_name_gunzip, /*unused:*/ NULL);
+}
+#endif
+
+
+/*
+ * Modified for busybox by Glenn McGrath
+ * Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+//usage:#define bunzip2_trivial_usage
+//usage:       "[-cf] [FILE]..."
+//usage:#define bunzip2_full_usage "\n\n"
+//usage:       "Decompress FILEs (or stdin)\n"
+//usage:     "\nOptions:"
+//usage:     "\n    -c  Write to stdout"
+//usage:     "\n    -f  Force"
+//usage:#define bzcat_trivial_usage
+//usage:       "FILE"
+//usage:#define bzcat_full_usage "\n\n"
+//usage:       "Decompress to stdout"
+//applet:IF_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+//applet:IF_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP, bzcat))
+#if ENABLE_BUNZIP2
+static
+IF_DESKTOP(long long) int FAST_FUNC unpack_bunzip2(unpack_info_t *info UNUSED_PARAM)
+{
+    return unpack_bz2_stream_prime(STDIN_FILENO, STDOUT_FILENO);
+}
+int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int bunzip2_main(int argc UNUSED_PARAM, char **argv)
+{
+    getopt32(argv, "cfvdt");
+    argv += optind;
+    if (applet_name[2] == 'c') /* bzcat */
+        option_mask32 |= OPT_STDOUT;
+
+    return bbunpack(argv, unpack_bunzip2, make_new_name_generic, "bz2");
+}
 #endif
 
@@ -279 +343 @@
  * Based on bunzip.c from busybox
  *
- * Licensed under GPL v2, see file LICENSE in this tarball for details.
- */
-
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 #if ENABLE_UNLZMA
-
-static
-char* make_new_name_unlzma(char *filename)
-{
-    return make_new_name_generic(filename, "lzma");
-}
-
-static
-USE_DESKTOP(long long) int unpack_unlzma(void)
+static
+IF_DESKTOP(long long) int FAST_FUNC unpack_unlzma(unpack_info_t *info UNUSED_PARAM)
 {
     return unpack_lzma_stream(STDIN_FILENO, STDOUT_FILENO);
 }
-
-int unlzma_main(int argc, char **argv);
-int unlzma_main(int argc, char **argv)
-{
-    getopt32(argv, "cf");
+int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int unlzma_main(int argc UNUSED_PARAM, char **argv)
+{
+    IF_LZMA(int opts =) getopt32(argv, "cfvdt");
+# if ENABLE_LZMA
+    /* lzma without -d or -t? */
+    if (applet_name[2] == 'm' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
+        bb_show_usage();
+# endif
+    /* lzcat? */
+    if (applet_name[2] == 'c')
+        option_mask32 |= OPT_STDOUT;
+
     argv += optind;
-    /* lzmacat? */
-    if (applet_name[4] == 'c')
+    return bbunpack(argv, unpack_unlzma, make_new_name_generic, "lzma");
+}
+#endif
+
+
+#if ENABLE_UNXZ
+static
+IF_DESKTOP(long long) int FAST_FUNC unpack_unxz(unpack_info_t *info UNUSED_PARAM)
+{
+    struct {
+        uint32_t v1;
+        uint16_t v2;
+    } magic;
+    xread(STDIN_FILENO, &magic, 6);
+    if (magic.v1 != XZ_MAGIC1a || magic.v2 != XZ_MAGIC2a) {
+        bb_error_msg("invalid magic");
+        return -1;
+    }
+    return unpack_xz_stream(STDIN_FILENO, STDOUT_FILENO);
+}
+int unxz_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int unxz_main(int argc UNUSED_PARAM, char **argv)
+{
+    IF_XZ(int opts =) getopt32(argv, "cfvdt");
+# if ENABLE_XZ
+    /* xz without -d or -t? */
+    if (applet_name[2] == '\0' && !(opts & (OPT_DECOMPRESS|OPT_TEST)))
+        bb_show_usage();
+# endif
+    /* xzcat? */
+    if (applet_name[2] == 'c')
         option_mask32 |= OPT_STDOUT;
 
-    return bbunpack(argv, make_new_name_unlzma, unpack_unlzma);
-}
-
-#endif
-
-
-/*
- *  Uncompress applet for busybox (c) 2002 Glenn McGrath
- *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
- */
-
-#if ENABLE_UNCOMPRESS
-
-static
-char* make_new_name_uncompress(char *filename)
-{
-    return make_new_name_generic(filename, "Z");
-}
-
-static
-USE_DESKTOP(long long) int unpack_uncompress(void)
-{
-    USE_DESKTOP(long long) int status = -1;
-
-    if ((xread_char(STDIN_FILENO) != 0x1f) || (xread_char(STDIN_FILENO) != 0x9d)) {
-        bb_error_msg("invalid magic");
-    } else {
-        status = uncompress(STDIN_FILENO, STDOUT_FILENO);
-    }
-    return status;
-}
-
-int uncompress_main(int argc, char **argv);
-int uncompress_main(int argc, char **argv)
-{
-    getopt32(argv, "cf");
     argv += optind;
-
-    return bbunpack(argv, make_new_name_uncompress, unpack_uncompress);
-}
-
-#endif
+    return bbunpack(argv, unpack_unxz, make_new_name_generic, "xz");
+}
+#endif