just include fcntl.h not sys/fcntl.h
[oweals/busybox.git] / archival / dpkg.c
index 2ebbbdf4ef72930a30cb7f0951bfd3dbffbfeafd..74d3a83d943ecab368cf6a5840a3c8634dae2d20 100644 (file)
@@ -1,10 +1,10 @@
 /*
  *  Mini dpkg implementation for busybox.
- *  This is not meant as a replacemnt for dpkg
+ *  This is not meant as a replacement for dpkg
  *
  *  Written By Glenn McGrath with the help of others
  *  Copyright (C) 2001 by Glenn McGrath
- *             
+ *
  *  Started life as a busybox implementation of udpkg
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
  */
 
 /*
- * Known difference between busybox dpkg and the official dpkg that i dont
+ * Known difference between busybox dpkg and the official dpkg that i don't
  * consider important, its worth keeping a note of differences anyway, just to
  * make it easier to maintain.
  *  - The first value for the Confflile: field isnt placed on a new line.
  *    int's and chaos is assured, 16381 is the max prime for 14 bit field
  */
 
-/* NAME_HASH_PRIME, Stores package names and versions, 
+/* NAME_HASH_PRIME, Stores package names and versions,
  * I estimate it should be at least 50% bigger than PACKAGE_HASH_PRIME,
  * as there a lot of duplicate version numbers */
 #define NAME_HASH_PRIME 16381
-char *name_hashtable[NAME_HASH_PRIME + 1];
+static char *name_hashtable[NAME_HASH_PRIME + 1];
 
 /* PACKAGE_HASH_PRIME, Maximum number of unique packages,
  * It must not be smaller than STATUS_HASH_PRIME,
@@ -82,19 +82,19 @@ typedef struct common_node_s {
        unsigned int num_of_edges:14;
        edge_t **edge;
 } common_node_t;
-common_node_t *package_hashtable[PACKAGE_HASH_PRIME + 1];
+static common_node_t *package_hashtable[PACKAGE_HASH_PRIME + 1];
 
 /* Currently it doesnt store packages that have state-status of not-installed
  * So it only really has to be the size of the maximum number of packages
- * likely to be installed at any one time, so there is a bit of leaway here */
+ * likely to be installed at any one time, so there is a bit of leeway here */
 #define STATUS_HASH_PRIME 8191
 typedef struct status_node_s {
        unsigned int package:14;        /* has to fit PACKAGE_HASH_PRIME */
        unsigned int status:14;         /* has to fit STATUS_HASH_PRIME */
 } status_node_t;
-status_node_t *status_hashtable[STATUS_HASH_PRIME + 1];
+static status_node_t *status_hashtable[STATUS_HASH_PRIME + 1];
 
-/* Even numbers are for 'extras', like ored dependecies or null */
+/* Even numbers are for 'extras', like ored dependencies or null */
 enum edge_type_e {
        EDGE_NULL = 0,
        EDGE_PRE_DEPENDS = 1,
@@ -137,7 +137,7 @@ typedef struct deb_file_s {
 } deb_file_t;
 
 
-void make_hash(const char *key, unsigned int *start, unsigned int *decrement, const int hash_prime)
+static void make_hash(const char *key, unsigned int *start, unsigned int *decrement, const int hash_prime)
 {
        unsigned long int hash_num = key[0];
        int len = strlen(key);
@@ -148,16 +148,16 @@ void make_hash(const char *key, unsigned int *start, unsigned int *decrement, co
        for(i = 1; i < len; i++) {
                /* shifts the ascii based value and adds it to previous value
                 * shift amount is mod 24 because long int is 32 bit and data
-                * to be shifted is 8, dont want to shift data to where it has
+                * to be shifted is 8, don't want to shift data to where it has
                 * no effect*/
-               hash_num += ((key[i] + key[i-1]) << ((key[i] * i) % 24)); 
+               hash_num += ((key[i] + key[i-1]) << ((key[i] * i) % 24));
        }
        *start = (unsigned int) hash_num % hash_prime;
        *decrement = (unsigned int) 1 + (hash_num % (hash_prime - 1));
 }
 
 /* this adds the key to the hash table */
-int search_name_hashtable(const char *key)
+static int search_name_hashtable(const char *key)
 {
        unsigned int probe_address = 0;
        unsigned int probe_decrement = 0;
@@ -181,7 +181,7 @@ int search_name_hashtable(const char *key)
 /* this DOESNT add the key to the hashtable
  * TODO make it consistent with search_name_hashtable
  */
-unsigned int search_status_hashtable(const char *key)
+static unsigned int search_status_hashtable(const char *key)
 {
        unsigned int probe_address = 0;
        unsigned int probe_decrement = 0;
@@ -201,7 +201,7 @@ unsigned int search_status_hashtable(const char *key)
 }
 
 /* Need to rethink version comparison, maybe the official dpkg has something i can use ? */
-int version_compare_part(const char *version1, const char *version2)
+static int version_compare_part(const char *version1, const char *version2)
 {
        int upstream_len1 = 0;
        int upstream_len2 = 0;
@@ -268,7 +268,7 @@ cleanup_version_compare_part:
  * if ver1 = ver2 return 0,
  * if ver1 > ver2 return 1,
  */
-int version_compare(const unsigned int ver1, const unsigned int ver2)
+static int version_compare(const unsigned int ver1, const unsigned int ver2)
 {
        char *ch_ver1 = name_hashtable[ver1];
        char *ch_ver2 = name_hashtable[ver2];
@@ -330,7 +330,7 @@ int version_compare(const unsigned int ver1, const unsigned int ver2)
        return(version_compare_part(deb_ver1, deb_ver2));
 }
 
-int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator)
+static int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator)
 {
        const int version_result = version_compare(version1, version2);
        switch(operator) {
@@ -366,7 +366,7 @@ int test_version(const unsigned int version1, const unsigned int version2, const
 }
 
 
-int search_package_hashtable(const unsigned int name, const unsigned int version, const unsigned int operator)
+static int search_package_hashtable(const unsigned int name, const unsigned int version, const unsigned int operator)
 {
        unsigned int probe_address = 0;
        unsigned int probe_decrement = 0;
@@ -392,7 +392,7 @@ int search_package_hashtable(const unsigned int name, const unsigned int version
 /*
  * This function searches through the entire package_hashtable looking
  * for a package which provides "needle". It returns the index into
- * the package_hashtable for the provining package.
+ * the package_hashtable for the providing package.
  *
  * needle is the index into name_hashtable of the package we are
  * looking for.
@@ -405,7 +405,7 @@ int search_package_hashtable(const unsigned int name, const unsigned int version
  * FIXME: I don't think this is very efficient, but I thought I'd keep
  * it simple for now until it proves to be a problem.
  */
-int search_for_provides(int needle, int start_at) {
+static int search_for_provides(int needle, int start_at) {
        int i, j;
        common_node_t *p;
        for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) {
@@ -421,7 +421,7 @@ int search_for_provides(int needle, int start_at) {
 /*
  * Add an edge to a node
  */
-void add_edge_to_node(common_node_t *node, edge_t *edge)
+static void add_edge_to_node(common_node_t *node, edge_t *edge)
 {
        node->num_of_edges++;
        node->edge = xrealloc(node->edge, sizeof(edge_t) * (node->num_of_edges + 1));
@@ -438,7 +438,7 @@ void add_edge_to_node(common_node_t *node, edge_t *edge)
  * field contains the number of EDGE nodes which follow as part of
  * this alternative.
  */
-void add_split_dependencies(common_node_t *parent_node, const char *whole_line, unsigned int edge_type)
+static void add_split_dependencies(common_node_t *parent_node, const char *whole_line, unsigned int edge_type)
 {
        char *line = bb_xstrdup(whole_line);
        char *line2;
@@ -464,11 +464,11 @@ void add_split_dependencies(common_node_t *parent_node, const char *whole_line,
                } else {
                        or_edge = NULL;
                }
-               
+
                if ( or_edge ) {
                        or_edge->name = search_name_hashtable(field);
                        or_edge->version = 0; // tracks the number of altenatives
-                       
+
                        add_edge_to_node(parent_node, or_edge);
                }
 
@@ -489,7 +489,7 @@ void add_split_dependencies(common_node_t *parent_node, const char *whole_line,
                                /* Skip leading ' ' or '(' */
                                version += strspn(field2, " ");
                                version += strspn(version, "(");
-                               /* Calculate length of any operator charactors */
+                               /* Calculate length of any operator characters */
                                offset_ch = strspn(version, "<=>");
                                /* Determine operator */
                                if (offset_ch > 0) {
@@ -537,24 +537,26 @@ void add_split_dependencies(common_node_t *parent_node, const char *whole_line,
        return;
 }
 
-void free_package(common_node_t *node)
+static void free_package(common_node_t *node)
 {
        unsigned short i;
        if (node) {
                for (i = 0; i < node->num_of_edges; i++) {
                        free(node->edge[i]);
                }
-               if ( node->edge )
-                       free(node->edge);
+               free(node->edge);
                free(node);
        }
 }
 
-unsigned int fill_package_struct(char *control_buffer)
+static unsigned int fill_package_struct(char *control_buffer)
 {
+       static const char *const field_names[] = { "Package", "Version",
+               "Pre-Depends", "Depends","Replaces", "Provides",
+               "Conflicts", "Suggests", "Recommends", "Enhances", 0
+       };
+
        common_node_t *new_node = (common_node_t *) xcalloc(1, sizeof(common_node_t));
-       const char *field_names[] = { "Package", "Version", "Pre-Depends", "Depends",
-               "Replaces", "Provides", "Conflicts", "Suggests", "Recommends", "Enhances", 0};
        char *field_name;
        char *field_value;
        int field_start = 0;
@@ -572,7 +574,7 @@ unsigned int fill_package_struct(char *control_buffer)
                        goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement ! */
                }
 
-               field_num = compare_string_array(field_names, field_name);              
+               field_num = compare_string_array(field_names, field_name);
                switch(field_num) {
                        case 0: /* Package */
                                new_node->name = search_name_hashtable(field_value);
@@ -624,7 +626,7 @@ fill_package_struct_cleanup:
 }
 
 /* if num = 1, it returns the want status, 2 returns flag, 3 returns status */
-unsigned int get_status(const unsigned int status_node, const int num)
+static unsigned int get_status(const unsigned int status_node, const int num)
 {
        char *status_string = name_hashtable[status_hashtable[status_node]->status];
        char *state_sub_string;
@@ -636,7 +638,7 @@ unsigned int get_status(const unsigned int status_node, const int num)
        for (i = 1; i < num; i++) {
                /* skip past a word */
                status_string += strcspn(status_string, " ");
-               /* skip past the seperating spaces */
+               /* skip past the separating spaces */
                status_string += strspn(status_string, " ");
        }
        len = strcspn(status_string, " \n\0");
@@ -646,7 +648,7 @@ unsigned int get_status(const unsigned int status_node, const int num)
        return(state_sub_num);
 }
 
-void set_status(const unsigned int status_node_num, const char *new_value, const int position)
+static void set_status(const unsigned int status_node_num, const char *new_value, const int position)
 {
        const unsigned int new_value_len = strlen(new_value);
        const unsigned int new_value_num = search_name_hashtable(new_value);
@@ -682,7 +684,7 @@ void set_status(const unsigned int status_node_num, const char *new_value, const
        return;
 }
 
-const char *describe_status(int status_num) {
+static const char *describe_status(int status_num) {
        int status_want, status_state ;
        if ( status_hashtable[status_num] == NULL || status_hashtable[status_num]->status == 0 )
                return "is not installed or flagged to be installed\n";
@@ -697,7 +699,7 @@ const char *describe_status(int status_num) {
                        return "is marked to be removed";
                if ( status_want == search_name_hashtable("purge") )
                        return "is marked to be purged";
-       } 
+       }
        if ( status_want ==  search_name_hashtable("unknown") )
                return "is in an indeterminate state";
        if ( status_want == search_name_hashtable("install") )
@@ -707,7 +709,7 @@ const char *describe_status(int status_num) {
 }
 
 
-void index_status_file(const char *filename)
+static void index_status_file(const char *filename)
 {
        FILE *status_file;
        char *control_buffer;
@@ -812,7 +814,7 @@ char *get_depends_field(common_node_t *package, const int depends_type)
 }
 #endif
 
-void write_buffer_no_status(FILE *new_status_file, const char *control_buffer)
+static void write_buffer_no_status(FILE *new_status_file, const char *control_buffer)
 {
        char *name;
        char *value;
@@ -830,7 +832,7 @@ void write_buffer_no_status(FILE *new_status_file, const char *control_buffer)
 }
 
 /* This could do with a cleanup */
-void write_status_file(deb_file_t **deb_file)
+static void write_status_file(deb_file_t **deb_file)
 {
        FILE *old_status_file = bb_xfopen("/var/lib/dpkg/status", "r");
        FILE *new_status_file = bb_xfopen("/var/lib/dpkg/status.udeb", "w");
@@ -850,7 +852,7 @@ void write_status_file(deb_file_t **deb_file)
                }
 
                tmp_string += 8;
-               tmp_string += strspn(tmp_string, " \n\t");
+               tmp_string += strspn(tmp_string, " \n\t");
                package_name = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
                write_flag = FALSE;
                tmp_string = strstr(control_buffer, "Status:");
@@ -955,13 +957,13 @@ void write_status_file(deb_file_t **deb_file)
        fclose(new_status_file);
 
 
-       /* Create a seperate backfile to dpkg */
+       /* Create a separate backfile to dpkg */
        if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) {
-               struct stat stat_buf;   
+               struct stat stat_buf;
                if (stat("/var/lib/dpkg/status", &stat_buf) == 0) {
                        bb_error_msg_and_die("Couldnt create backup status file");
                }
-               /* Its ok if renaming the status file fails becasue status 
+               /* Its ok if renaming the status file fails because status
                 * file doesnt exist, maybe we are starting from scratch */
                bb_error_msg("No status file found, creating new one");
        }
@@ -971,14 +973,14 @@ void write_status_file(deb_file_t **deb_file)
        }
 }
 
-/* This function returns TRUE if the given package can statisfy a
+/* This function returns TRUE if the given package can satisfy a
  * dependency of type depend_type.
  *
- * A pre-depends is statisfied only if a package is already installed,
+ * A pre-depends is satisfied only if a package is already installed,
  * which a regular depends can be satisfied by a package which we want
  * to install.
  */
-int package_satisfies_dependency(int package, int depend_type)
+static int package_satisfies_dependency(int package, int depend_type)
 {
        int status_num = search_status_hashtable(name_hashtable[package_hashtable[package]->name]);
 
@@ -989,13 +991,13 @@ int package_satisfies_dependency(int package, int depend_type)
                return 0;
 
        switch (depend_type) {
-       case EDGE_PRE_DEPENDS:  return get_status(status_num, 3) == search_name_hashtable("installed");
-       case EDGE_DEPENDS:      return get_status(status_num, 1) == search_name_hashtable("install");
+       case EDGE_PRE_DEPENDS:  return get_status(status_num, 3) == search_name_hashtable("installed");
+       case EDGE_DEPENDS:      return get_status(status_num, 1) == search_name_hashtable("install");
        }
        return 0;
 }
 
-int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
+static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
 {
        int *conflicts = NULL;
        int conflicts_num = 0;
@@ -1056,10 +1058,10 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                        const edge_t *package_edge = package_node->edge[j];
 
                        if (package_edge->type == EDGE_CONFLICTS) {
-                               const unsigned int package_num = 
+                               const unsigned int 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]);
@@ -1078,14 +1080,14 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                        }
                }
                i++;
-       }           
+       }
 
 
        /* Check dependendcies */
        for (i = 0; i < PACKAGE_HASH_PRIME; i++) {
                int status_num = 0;
                int number_of_alternatives = 0;
-               const edge_t * root_of_alternatives;
+               const edge_t * root_of_alternatives = NULL;
                const common_node_t *package_node = package_hashtable[i];
 
                /* If the package node does not exist then this
@@ -1098,7 +1100,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
 
                /* If there is no status then this package is a
                 * virtual one provided by something else. In which
-                * case there are no dependencies to check. 
+                * case there are no dependencies to check.
                 */
                if ( status_hashtable[status_num] == NULL ) continue;
 
@@ -1114,24 +1116,24 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                 * things which are broken but unrelated to the
                 * packages that are currently being installed
                 */
-                if (state_status == search_name_hashtable("installed"))
-                        continue;
+               if (state_status == search_name_hashtable("installed"))
+                       continue;
 #endif
 
-               /* This code is tested only for EDGE_DEPENDS, sine I
+               /* This code is tested only for EDGE_DEPENDS, since I
                 * have no suitable pre-depends available. There is no
                 * reason that it shouldn't work though :-)
                 */
                for (j = 0; j < package_node->num_of_edges; j++) {
                        const edge_t *package_edge = package_node->edge[j];
                        unsigned int package_num;
-                              
+
                        if ( package_edge->type == EDGE_OR_PRE_DEPENDS ||
-                            package_edge->type == EDGE_OR_DEPENDS ) {  /* start an EDGE_OR_ list */
+                            package_edge->type == EDGE_OR_DEPENDS ) {  /* start an EDGE_OR_ list */
                                number_of_alternatives = package_edge->version;
                                root_of_alternatives = package_edge;
                                continue;
-                       } else if ( number_of_alternatives == 0 ) {     /* not in the middle of an EDGE_OR_ list */
+                       } else if ( number_of_alternatives == 0 ) {     /* not in the middle of an EDGE_OR_ list */
                                number_of_alternatives = 1;
                                root_of_alternatives = NULL;
                        }
@@ -1147,26 +1149,26 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                                 * this edge is the right type.
                                 *
                                 * EDGE_DEPENDS == OR_DEPENDS -1
-                                * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1 
+                                * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1
                                 */
                                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 \n",
                                                             package_edge->type, root_of_alternatives->type);
-                               
+
                                if (package_hashtable[package_num] != NULL)
                                        result = !package_satisfies_dependency(package_num, package_edge->type);
 
                                if (result) { /* check for other package which provide what we are looking for */
                                        int provider = -1;
-                                       
+
                                        while ( (provider = search_for_provides(package_edge->name, provider) ) > -1 ) {
                                                if ( package_hashtable[provider] == NULL ) {
                                                        printf("Have a provider but no package information for it\n");
                                                        continue;
-                                               }                                               
+                                               }
                                                result = !package_satisfies_dependency(provider, package_edge->type);
-                                               
-                                               if ( result == 0 ) 
+
+                                               if ( result == 0 )
                                                        break;
                                        }
                                }
@@ -1176,14 +1178,14 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                                if (result && number_of_alternatives == 0) {
                                        if ( root_of_alternatives )
                                                bb_error_msg_and_die(
-                                                       "Package %s %sdepends on %s, " 
+                                                       "Package %s %sdepends on %s, "
                                                        "which cannot be satisfied",
                                                        name_hashtable[package_node->name],
                                                        package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
                                                        name_hashtable[root_of_alternatives->name]);
-                                       else 
+                                       else
                                                bb_error_msg_and_die(
-                                                       "Package %s %sdepends on %s, which %s\n", 
+                                                       "Package %s %sdepends on %s, which %s\n",
                                                        name_hashtable[package_node->name],
                                                        package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
                                                        name_hashtable[package_edge->name],
@@ -1192,7 +1194,7 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
                                        /* we've found a package which
                                         * satisfies the dependency,
                                         * so skip over the rest of
-                                        * the alternatives. 
+                                        * the alternatives.
                                         */
                                        j += number_of_alternatives;
                                        number_of_alternatives = 0;
@@ -1204,14 +1206,14 @@ int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
        return(TRUE);
 }
 
-char **create_list(const char *filename)
+static char **create_list(const char *filename)
 {
        FILE *list_stream;
        char **file_list = NULL;
        char *line = NULL;
        int count = 0;
 
-       /* dont use [xw]fopen here, handle error ourself */
+       /* don't use [xw]fopen here, handle error ourself */
        list_stream = fopen(filename, "r");
        if (list_stream == NULL) {
                return(NULL);
@@ -1233,7 +1235,7 @@ char **create_list(const char *filename)
 }
 
 /* maybe i should try and hook this into remove_file.c somehow */
-int remove_file_array(char **remove_names, char **exclude_names)
+static int remove_file_array(char **remove_names, char **exclude_names)
 {
        struct stat path_stat;
        int match_flag;
@@ -1271,7 +1273,7 @@ int remove_file_array(char **remove_names, char **exclude_names)
        return(remove_flag);
 }
 
-int run_package_script(const char *package_name, const char *script_type)
+static int run_package_script(const char *package_name, const char *script_type)
 {
        struct stat path_stat;
        char *script_path;
@@ -1290,16 +1292,16 @@ int run_package_script(const char *package_name, const char *script_type)
        return(result);
 }
 
-const char *all_control_files[] = {"preinst", "postinst", "prerm", "postrm",
+static const char *all_control_files[] = {"preinst", "postinst", "prerm", "postrm",
        "list", "md5sums", "shlibs", "conffiles", "config", "templates", NULL };
 
-char **all_control_list(const char *package_name)
+static char **all_control_list(const char *package_name)
 {
        unsigned short i = 0;
        char **remove_files;
 
        /* Create a list of all /var/lib/dpkg/info/<package> files */
-       remove_files = malloc(sizeof(all_control_files));
+       remove_files = xmalloc(sizeof(all_control_files));
        while (all_control_files[i]) {
                remove_files[i] = xmalloc(strlen(package_name) + strlen(all_control_files[i]) + 21);
                sprintf(remove_files[i], "/var/lib/dpkg/info/%s.%s", package_name, all_control_files[i]);
@@ -1310,9 +1312,9 @@ char **all_control_list(const char *package_name)
        return(remove_files);
 }
 
-void free_array(char **array)
+static void free_array(char **array)
 {
-       
+
        if (array) {
                unsigned short i = 0;
                while (array[i]) {
@@ -1325,15 +1327,15 @@ void free_array(char **array)
 
 /* This function lists information on the installed packages. It loops through
  * the status_hashtable to retrieve the info. This results in smaller code than
- * scanning the status file. The resulting list, however, is unsorted. 
+ * scanning the status file. The resulting list, however, is unsorted.
  */
-void list_packages(void)
+static void list_packages(void)
 {
-        int i;
+       int i;
 
        printf("    Name           Version\n");
        printf("+++-==============-==============\n");
-       
+
        /* go through status hash, dereference package hash and finally strings */
        for (i=0; i<STATUS_HASH_PRIME+1; i++) {
 
@@ -1342,29 +1344,29 @@ void list_packages(void)
                        const char *name_str;  /* package name */
                        const char *vers_str;  /* version */
                        char  s1, s2;          /* status abbreviations */
-                       int   spccnt;          /* space count */      
+                       int   spccnt;          /* space count */
                        int   j;
-                       
+
                        stat_str = name_hashtable[status_hashtable[i]->status];
                        name_str = name_hashtable[package_hashtable[status_hashtable[i]->package]->name];
                        vers_str = name_hashtable[package_hashtable[status_hashtable[i]->package]->version];
-                       
+
                        /* get abbreviation for status field 1 */
                        s1 = stat_str[0] == 'i' ? 'i' : 'r';
-                       
+
                        /* get abbreviation for status field 2 */
                        for (j=0, spccnt=0; stat_str[j] && spccnt<2; j++) {
                                if (stat_str[j] == ' ') spccnt++;
                        }
                        s2 = stat_str[j];
-                       
+
                        /* print out the line formatted like Debian dpkg */
                        printf("%c%c  %-14s %s\n", s1, s2, name_str, vers_str);
                }
     }
 }
 
-void remove_package(const unsigned int package_num, int noisy)
+static void remove_package(const unsigned int package_num, int noisy)
 {
        const char *package_name = name_hashtable[package_hashtable[package_num]->name];
        const char *package_version = name_hashtable[package_hashtable[package_num]->version];
@@ -1376,7 +1378,7 @@ void remove_package(const unsigned int package_num, int noisy)
        char conffile_name[package_name_length + 30];
        int return_value;
 
-       if ( noisy ) 
+       if ( noisy )
                printf("Removing %s (%s) ...\n", package_name, package_version);
 
        /* run prerm script */
@@ -1385,7 +1387,7 @@ void remove_package(const unsigned int package_num, int noisy)
                bb_error_msg_and_die("script failed, prerm failure");
        }
 
-       /* Create a list of files to remove, and a seperate list of those to keep */
+       /* Create a list of files to remove, and a separate list of those to keep */
        sprintf(list_name, "/var/lib/dpkg/info/%s.list", package_name);
        remove_files = create_list(list_name);
 
@@ -1418,7 +1420,7 @@ void remove_package(const unsigned int package_num, int noisy)
        set_status(status_num, "config-files", 3);
 }
 
-void purge_package(const unsigned int package_num)
+static void purge_package(const unsigned int package_num)
 {
        const char *package_name = name_hashtable[package_hashtable[package_num]->name];
        const char *package_version = name_hashtable[package_hashtable[package_num]->version];
@@ -1464,12 +1466,12 @@ static archive_handle_t *init_archive_deb_ar(const char *filename)
 {
        archive_handle_t *ar_handle;
 
-       /* Setup an ar archive handle that refers to the gzip sub archive */    
+       /* Setup an ar archive handle that refers to the gzip sub archive */
        ar_handle = init_handle();
        ar_handle->filter = filter_accept_list_reassign;
        ar_handle->src_fd = bb_xopen(filename, O_RDONLY);
 
-       return(ar_handle);      
+       return(ar_handle);
 }
 
 static void init_archive_deb_control(archive_handle_t *ar_handle)
@@ -1480,7 +1482,7 @@ static void init_archive_deb_control(archive_handle_t *ar_handle)
        tar_handle = init_handle();
        tar_handle->src_fd = ar_handle->src_fd;
 
-       /* We dont care about data.tar.* or debian-binary, just control.tar.* */
+       /* We don't care about data.tar.* or debian-binary, just control.tar.* */
 #ifdef CONFIG_FEATURE_DEB_TAR_GZ
        ar_handle->accept = llist_add_to(NULL, "control.tar.gz");
 #endif
@@ -1491,7 +1493,7 @@ static void init_archive_deb_control(archive_handle_t *ar_handle)
        /* Assign the tar handle as a subarchive of the ar handle */
        ar_handle->sub_archive = tar_handle;
 
-       return; 
+       return;
 }
 
 static void init_archive_deb_data(archive_handle_t *ar_handle)
@@ -1502,7 +1504,7 @@ static void init_archive_deb_data(archive_handle_t *ar_handle)
        tar_handle = init_handle();
        tar_handle->src_fd = ar_handle->src_fd;
 
-       /* We dont care about control.tar.* or debian-binary, just data.tar.* */
+       /* We don't care about control.tar.* or debian-binary, just data.tar.* */
 #ifdef CONFIG_FEATURE_DEB_TAR_GZ
        ar_handle->accept = llist_add_to(NULL, "data.tar.gz");
 #endif
@@ -1513,13 +1515,14 @@ static void init_archive_deb_data(archive_handle_t *ar_handle)
        /* Assign the tar handle as a subarchive of the ar handle */
        ar_handle->sub_archive = tar_handle;
 
-       return; 
+       return;
 }
 
 static char *deb_extract_control_file_to_buffer(archive_handle_t *ar_handle, llist_t *myaccept)
 {
        ar_handle->sub_archive->action_data = data_extract_to_buffer;
        ar_handle->sub_archive->accept = myaccept;
+       ar_handle->sub_archive->filter = filter_accept_list;
 
        unpack_ar_archive(ar_handle);
        close(ar_handle->src_fd);
@@ -1586,7 +1589,7 @@ static void unpack_package(deb_file_t *deb_file)
        if (run_package_script(package_name, "preinst") != 0) {
                /* when preinst returns exit code != 0 then quit installation process */
                bb_error_msg_and_die("subprocess pre-installation script returned error.");
-       }       
+       }
 
        /* Extract data.tar.gz to the root directory */
        archive_handle = init_archive_deb_ar(deb_file->filename);
@@ -1598,7 +1601,7 @@ static void unpack_package(deb_file_t *deb_file)
 
        /* Create the list file */
        strcat(info_prefix, "list");
-       out_stream = bb_xfopen(info_prefix, "w");                       
+       out_stream = bb_xfopen(info_prefix, "w");
        while (archive_handle->sub_archive->passed) {
                /* the leading . has been stripped by data_extract_all_prefix already */
                fputs(archive_handle->sub_archive->passed->data, out_stream);
@@ -1614,7 +1617,7 @@ static void unpack_package(deb_file_t *deb_file)
        free(info_prefix);
 }
 
-void configure_package(deb_file_t *deb_file)
+static void configure_package(deb_file_t *deb_file)
 {
        const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
        const char *package_version = name_hashtable[package_hashtable[deb_file->package]->version];
@@ -1653,7 +1656,7 @@ int dpkg_main(int argc, char **argv)
                        case 'F': // equivalent to --force in official dpkg
                                if (strcmp(optarg, "depends") == 0) {
                                        dpkg_opt |= dpkg_opt_force_ignore_depends;
-                               }                               
+                               }
                                break;
                        case 'i':
                                dpkg_opt |= dpkg_opt_install;
@@ -1691,7 +1694,7 @@ int dpkg_main(int argc, char **argv)
                list_packages();
                return(EXIT_SUCCESS);
        }
-       
+
        /* Read arguments and store relevant info in structs */
        while (optind < argc) {
                /* deb_count = nb_elem - 1 and we need nb_elem + 1 to allocate terminal node [NULL pointer] */
@@ -1714,6 +1717,7 @@ int dpkg_main(int argc, char **argv)
 
                        if (package_num == -1) {
                                bb_error_msg("Invalid control file in %s", argv[optind]);
+                               optind++;
                                continue;
                        }
                        deb_file[deb_count]->package = (unsigned int) package_num;