udhcpc: fix a problem with binary-encoded options #2

[oweals/busybox.git] / archival / dpkg.c

diff --git a/archival/dpkg.c b/archival/dpkg.c
index 53e30d54103cfd0922d0bfc38a3726378b16b511..ed86f3355df460d64b2247f5b66f71f540e39850 100644 (file)
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -28,9 +28,36 @@
  *
  */
 
+//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 "unarchive.h"
+#include "bb_archive.h"
 
 /* note: if you vary hash_prime sizes be aware,
  * 1) tweaking these will have a big effect on how much memory this program uses.
@@ -674,28 +701,21 @@ static unsigned get_status(const unsigned status_node, const int num)
 
 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;
 
        switch (position) {
                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:
                        bb_error_msg_and_die("DEBUG ONLY: this shouldnt happen");
@@ -1006,8 +1026,8 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                        if (package_edge->type == EDGE_CONFLICTS) {
                                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) {
                                        status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
@@ -1094,7 +1114,7 @@ static int check_deps(deb_file_t **deb_file, int deb_start /*, int dep_max_count
                                 */
                                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)
                                        result = !package_satisfies_dependency(package_num, package_edge->type);
@@ -1645,20 +1665,25 @@ static void unpack_package(deb_file_t *deb_file)
        archive_handle = init_archive_deb_ar(deb_file->filename);
        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);
 
        /* Create the list file */
        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);