Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/archival/dpkg.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/archival/dpkg.c (modified) (7 diffs)

branches/3.2/mindi-busybox/archival/dpkg.c

@@ -29 +29 @@
  */
 
+//usage:#define dpkg_trivial_usage
+//usage:       "[-ilCPru] [-F OPT] PACKAGE"
+//usage:#define dpkg_full_usage "\n\n"
+//usage:       "Install, remove and manage Debian packages\n"
+//usage:    IF_LONG_OPTS(
+//usage:     "\n    -i,--install    Install the package"
+//usage:     "\n    -l,--list   List of installed packages"
+//usage:     "\n    --configure Configure an unpackaged package"
+//usage:     "\n    -P,--purge  Purge all files of a package"
+//usage:     "\n    -r,--remove Remove all but the configuration files for a package"
+//usage:     "\n    --unpack    Unpack a package, but don't configure it"
+//usage:     "\n    --force-depends Ignore dependency problems"
+//usage:     "\n    --force-confnew Overwrite existing config files when installing"
+//usage:     "\n    --force-confold Keep old config files when installing"
+//usage:    )
+//usage:    IF_NOT_LONG_OPTS(
+//usage:     "\n    -i      Install the package"
+//usage:     "\n    -l      List of installed packages"
+//usage:     "\n    -C      Configure an unpackaged package"
+//usage:     "\n    -P      Purge all files of a package"
+//usage:     "\n    -r      Remove all but the configuration files for a package"
+//usage:     "\n    -u      Unpack a package, but don't configure it"
+//usage:     "\n    -F depends  Ignore dependency problems"
+//usage:     "\n    -F confnew  Overwrite existing config files when installing"
+//usage:     "\n    -F confold  Keep old config files when installing"
+//usage:    )
+
 #include "libbb.h"
 #include <fnmatch.h>
-#include "archive.h"
+#include "bb_archive.h"
 
 /* note: if you vary hash_prime sizes be aware,
@@ -675 +702 @@
 static void set_status(const unsigned status_node_num, const char *new_value, const int position)
 {
-    const unsigned new_value_len = strlen(new_value);
     const unsigned new_value_num = search_name_hashtable(new_value);
     unsigned want = get_status(status_node_num, 1);
     unsigned flag = get_status(status_node_num, 2);
     unsigned status = get_status(status_node_num, 3);
-    int want_len = strlen(name_hashtable[want]);
-    int flag_len = strlen(name_hashtable[flag]);
-    int status_len = strlen(name_hashtable[status]);
     char *new_status;
 
@@ -688 +711 @@
         case 1:
             want = new_value_num;
-            want_len = new_value_len;
             break;
         case 2:
             flag = new_value_num;
-            flag_len = new_value_len;
             break;
         case 3:
             status = new_value_num;
-            status_len = new_value_len;
             break;
         default:
@@ -1007 +1027 @@
                 const unsigned package_num =
                     search_package_hashtable(package_edge->name,
-                                 package_edge->version,
-                                 package_edge->operator);
+                                package_edge->version,
+                                package_edge->operator);
                 int result = 0;
                 if (package_hashtable[package_num] != NULL) {
@@ -1095 +1115 @@
                 if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
                     bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1",
-                                 package_edge->type, root_of_alternatives->type);
+                            package_edge->type, root_of_alternatives->type);
 
                 if (package_hashtable[package_num] != NULL)
@@ -1646 +1666 @@
     init_archive_deb_data(archive_handle);
     archive_handle->dpkg__sub_archive->accept = conffile_list;
+    /* Why ARCHIVE_REMEMBER_NAMES?
+     * We want names collected in ->passed list even if conffile_list
+     * is NULL (otherwise get_header_tar may optimize name saving out):
+     */
+    archive_handle->dpkg__sub_archive->ah_flags |= ARCHIVE_REMEMBER_NAMES | ARCHIVE_UNLINK_OLD;
     archive_handle->dpkg__sub_archive->filter = filter_rename_config;
     archive_handle->dpkg__sub_archive->action_data = data_extract_all_prefix;
     archive_handle->dpkg__sub_archive->dpkg__buffer = (char*)"/"; /* huh? */
-    archive_handle->dpkg__sub_archive->ah_flags |= ARCHIVE_UNLINK_OLD;
     unpack_ar_archive(archive_handle);
 
@@ -1655 +1679 @@
     list_filename = xasprintf("/var/lib/dpkg/info/%s.%s", package_name, "list");
     out_stream = xfopen_for_write(list_filename);
+    archive_handle->dpkg__sub_archive->passed = llist_rev(archive_handle->dpkg__sub_archive->passed);
     while (archive_handle->dpkg__sub_archive->passed) {
+        char *filename = llist_pop(&archive_handle->dpkg__sub_archive->passed);
         /* the leading . has been stripped by data_extract_all_prefix already */
-        fputs(archive_handle->dpkg__sub_archive->passed->data, out_stream);
-        fputc('\n', out_stream);
-        archive_handle->dpkg__sub_archive->passed = archive_handle->dpkg__sub_archive->passed->link;
+        fprintf(out_stream, "%s\n", filename);
+        free(filename);
     }
     fclose(out_stream);