Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/archival/dpkg_deb.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/dpkg_deb.c (modified) (5 diffs)

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

@@ -3 +3 @@
  * dpkg-deb packs, unpacks and provides information about Debian archives.
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include "libbb.h"
-#include "unarchive.h"
+#include "archive.h"
 
-#define DPKG_DEB_OPT_CONTENTS   1
-#define DPKG_DEB_OPT_CONTROL    2
-#define DPKG_DEB_OPT_FIELD  4
-#define DPKG_DEB_OPT_EXTRACT    8
-#define DPKG_DEB_OPT_EXTRACT_VERBOSE    16
+#define DPKG_DEB_OPT_CONTENTS         1
+#define DPKG_DEB_OPT_CONTROL          2
+#define DPKG_DEB_OPT_FIELD            4
+#define DPKG_DEB_OPT_EXTRACT          8
+#define DPKG_DEB_OPT_EXTRACT_VERBOSE 16
 
-int dpkg_deb_main(int argc, char **argv);
+int dpkg_deb_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int dpkg_deb_main(int argc, char **argv)
 {
@@ -21 +21 @@
     llist_t *control_tar_llist = NULL;
     unsigned opt;
-    const char *extract_dir = NULL;
-    short argcount = 1;
+    const char *extract_dir;
+    int need_args;
 
     /* Setup the tar archive handle */
@@ -29 +29 @@
     /* Setup an ar archive handle that refers to the gzip sub archive */
     ar_archive = init_handle();
-    ar_archive->sub_archive = tar_archive;
+    ar_archive->dpkg__sub_archive = tar_archive;
     ar_archive->filter = filter_accept_list_reassign;
 
-#if ENABLE_FEATURE_DEB_TAR_GZ
-    llist_add_to(&(ar_archive->accept), (char*)"data.tar.gz");
+#if ENABLE_FEATURE_SEAMLESS_GZ
+    llist_add_to(&ar_archive->accept, (char*)"data.tar.gz");
     llist_add_to(&control_tar_llist, (char*)"control.tar.gz");
 #endif
-
-#if ENABLE_FEATURE_DEB_TAR_BZ2
-    llist_add_to(&(ar_archive->accept), (char*)"data.tar.bz2");
+#if ENABLE_FEATURE_SEAMLESS_BZ2
+    llist_add_to(&ar_archive->accept, (char*)"data.tar.bz2");
     llist_add_to(&control_tar_llist, (char*)"control.tar.bz2");
 #endif
+#if ENABLE_FEATURE_SEAMLESS_LZMA
+    llist_add_to(&ar_archive->accept, (char*)"data.tar.lzma");
+    llist_add_to(&control_tar_llist, (char*)"control.tar.lzma");
+#endif
 
-    opt_complementary = "?c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
+    opt_complementary = "c--efXx:e--cfXx:f--ceXx:X--cefx:x--cefX";
     opt = getopt32(argv, "cefXx");
+    argv += optind;
+    argc -= optind;
 
     if (opt & DPKG_DEB_OPT_CONTENTS) {
         tar_archive->action_header = header_verbose_list;
     }
+    extract_dir = NULL;
+    need_args = 1;
     if (opt & DPKG_DEB_OPT_CONTROL) {
         ar_archive->accept = control_tar_llist;
         tar_archive->action_data = data_extract_all;
-        if (optind + 1 == argc) {
+        if (1 == argc) {
             extract_dir = "./DEBIAN";
         } else {
-            argcount++;
+            need_args++;
         }
     }
@@ -71 +78 @@
     if (opt & (DPKG_DEB_OPT_EXTRACT_VERBOSE | DPKG_DEB_OPT_EXTRACT)) {
         tar_archive->action_data = data_extract_all;
-        argcount = 2;
+        need_args = 2;
     }
 
-    if ((optind + argcount) != argc) {
+    if (need_args != argc) {
         bb_show_usage();
     }
 
-    tar_archive->src_fd = ar_archive->src_fd = xopen(argv[optind++], O_RDONLY);
+    tar_archive->src_fd = ar_archive->src_fd = xopen(argv[0], O_RDONLY);
 
-    /* Workout where to extract the files */
+    /* Work out where to extract the files */
     /* 2nd argument is a dir name */
-    if (argv[optind]) {
-        extract_dir = argv[optind];
+    if (argv[1]) {
+        extract_dir = argv[1];
     }
     if (extract_dir) {
@@ -89 +96 @@
         xchdir(extract_dir);
     }
+
+    /* Do it */
     unpack_ar_archive(ar_archive);
 
     /* Cleanup */
-    close(ar_archive->src_fd);
+    if (ENABLE_FEATURE_CLEAN_UP)
+        close(ar_archive->src_fd);
 
     return EXIT_SUCCESS;