Standardize on the vi editing directives being on the first line.
[oweals/busybox.git] / archival / dpkg.c
index 24b02041a950a66dd275a4cd7f068471f3691eef..558e3cd48ce285d86a79d8964d7aa59d0936ad12 100644 (file)
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <search.h>
-#include <errno.h>
+/* vi: set sw=4 ts=4: */
+/*
+ *  Mini dpkg implementation for busybox.
+ *  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
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/*
+ * 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.
+ *  - When installing a package the Status: field is placed at the end of the
+ *      section, rather than just after the Package: field.
+ *
+ * Bugs that need to be fixed
+ *  - (unknown, please let me know when you find any)
+ *
+ */
+
 #include <fcntl.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
-#include <utime.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
+#include "unarchive.h"
 #include "busybox.h"
 
-//#define PACKAGE "udpkg"
-//#define VERSION "0.1"
-
-/*
- * Should we do full dependency checking?
+/* NOTE: If you vary HASH_PRIME sizes be aware,
+ * 1) Tweaking these will have a big effect on how much memory this program uses.
+ * 2) For computational efficiency these hash tables should be at least 20%
+ *    larger than the maximum number of elements stored in it.
+ * 3) All _HASH_PRIME's must be a prime number or chaos is assured, if your looking
+ *    for a prime, try http://www.utm.edu/research/primes/lists/small/10000.txt
+ * 4) If you go bigger than 15 bits you may get into trouble (untested) as its
+ *    sometimes cast to an unsigned int, if you go to 16 bit you will overlap
+ *    int's and chaos is assured, 16381 is the max prime for 14 bit field
  */
-#define DODEPENDS 1
 
-/*
- * Should we do debugging?
- */
-#define DODEBUG 0
-
-#ifdef DODEBUG
-#define SYSTEM(x) do_system(x)
-#define DPRINTF(fmt,args...) fprintf(stderr, fmt, ##args)
-#else
-#define SYSTEM(x) system(x)
-#define DPRINTF(fmt,args...) /* nothing */
-#endif
+/* 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
+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,
+ * Currently only packages from status_hashtable are stored in here, but in
+ * future this may be used to store packages not only from a status file,
+ * but an available_hashtable, and even multiple packages files.
+ * Package can be stored more than once if they have different versions.
+ * e.g. The same package may have different versions in the status file
+ *      and available file */
+#define PACKAGE_HASH_PRIME 10007
+typedef struct edge_s {
+       unsigned int operator:3;
+       unsigned int type:4;
+       unsigned int name:14;
+       unsigned int version:14;
+} edge_t;
+
+typedef struct common_node_s {
+       unsigned int name:14;
+       unsigned int version:14;
+       unsigned int num_of_edges:14;
+       edge_t **edge;
+} common_node_t;
+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 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;
+static status_node_t *status_hashtable[STATUS_HASH_PRIME + 1];
+
+/* Even numbers are for 'extras', like ored dependencies or null */
+enum edge_type_e {
+       EDGE_NULL = 0,
+       EDGE_PRE_DEPENDS = 1,
+       EDGE_OR_PRE_DEPENDS = 2,
+       EDGE_DEPENDS = 3,
+       EDGE_OR_DEPENDS = 4,
+       EDGE_REPLACES = 5,
+       EDGE_PROVIDES = 7,
+       EDGE_CONFLICTS = 9,
+       EDGE_SUGGESTS = 11,
+       EDGE_RECOMMENDS = 13,
+       EDGE_ENHANCES = 15
+};
+enum operator_e {
+       VER_NULL = 0,
+       VER_EQUAL = 1,
+       VER_LESS = 2,
+       VER_LESS_EQUAL = 3,
+       VER_MORE = 4,
+       VER_MORE_EQUAL = 5,
+       VER_ANY = 6
+};
 
-#define BUFSIZE                4096
-#define DEPENDSMAX     64      /* maximum number of depends we can handle */
-
-#define ADMINDIR "/var/lib/dpkg"
-#define STATUSFILE     ADMINDIR ## "/status.udeb"
-#define DPKGCIDIR      ADMINDIR ## "/tmp.ci/"
-static const char infodir[] = "/var/lib/dpkg/info/";
-static const char udpkg_quiet[] = "UDPKG_QUIET";
-
-//static const int status_wantstart    = 0;
-//static const int status_wantunknown  = (1 << 0);
-static const int status_wantinstall    = (1 << 1);
-//static const int status_wanthold     = (1 << 2);
-//static const int status_wantdeinstall        = (1 << 3);
-//static const int status_wantpurge    = (1 << 4);
-static const int status_wantmask       = 31;
-
-//static const int status_flagstart    = 5;
-static const int status_flagok = (1 << 5);     /* 32 */
-//static const int status_flagreinstreq        = (1 << 6); 
-//static const int status_flaghold     = (1 << 7);
-//static const int status_flagholdreinstreq    = (1 << 8);
-static const int status_flagmask       = 480;
-
-//static const int status_statusstart  = 9;
-//static const int status_statusnoninstalled   = (1 << 9); /* 512 */
-static const int status_statusunpacked = (1 << 10);
-static const int status_statushalfconfigured   = (1 << 11); 
-static const int status_statusinstalled        = (1 << 12);
-static const int status_statushalfinstalled    = (1 << 13);
-//static const int status_statusconfigfiles    = (1 << 14);
-//static const int status_statuspostinstfailed = (1 << 15);
-//static const int status_statusremovalfailed  = (1 << 16);
-static const int status_statusmask =  130560; /* i assume status_statusinstalled is supposed to be included */
-
-static const char *statuswords[][10] = {
-       { (char *) 0, "unknown", "install", "hold", "deinstall", "purge", 0 },
-       { (char *) 5, "ok", "reinstreq", "hold", "hold-reinstreq", 0 },
-       { (char *) 9, "not-installed", "unpacked", "half-configured",
-               "installed", "half-installed", "config-files",
-               "post-inst-failed", "removal-failed", 0 }
+enum dpkg_opt_e {
+       dpkg_opt_purge = 1,
+       dpkg_opt_remove = 2,
+       dpkg_opt_unpack = 4,
+       dpkg_opt_configure = 8,
+       dpkg_opt_install = 16,
+       dpkg_opt_package_name = 32,
+       dpkg_opt_filename = 64,
+       dpkg_opt_list_installed = 128,
+       dpkg_opt_force_ignore_depends = 256
 };
 
-const int color_white  = 0;
-const int color_grey   = 1;
-const int color_black  = 2;
+typedef struct deb_file_s {
+       char *control_file;
+       char *filename;
+       unsigned int package:14;
+} deb_file_t;
 
-/* data structures */
-typedef struct package_s {
-       char *file;
-       char *package;
-       char *version;
-       char *depends;
-       char *provides;
-       char *description;
-       int installer_menu_item;
-       unsigned long status;
-       char color; /* for topo-sort */
-       struct package_s *requiredfor[DEPENDSMAX]; 
-       unsigned short requiredcount;
-       struct package_s *next;
-} package_t;
 
-static int package_compare(const void *p1, const void *p2)
+static void make_hash(const char *key, unsigned int *start, unsigned int *decrement, const int hash_prime)
 {
-       return strcmp(((package_t *)p1)->package, 
-               ((package_t *)p2)->package);
-}
+       unsigned long int hash_num = key[0];
+       int len = strlen(key);
+       int i;
 
-#ifdef DODEPENDS
-#include <ctype.h>
+       /* Maybe i should have uses a "proper" hashing algorithm here instead
+        * of making one up myself, seems to be working ok though. */
+       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, don't want to shift data to where it has
+                * no effect*/
+               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));
+}
 
-static char **depends_split(const char *dependsstr)
+/* this adds the key to the hash table */
+static int search_name_hashtable(const char *key)
 {
-       static char *dependsvec[DEPENDSMAX];
-       char *p;
-       int i = 0;
+       unsigned int probe_address = 0;
+       unsigned int probe_decrement = 0;
+//     char *temp;
+
+       make_hash(key, &probe_address, &probe_decrement, NAME_HASH_PRIME);
+       while(name_hashtable[probe_address] != NULL) {
+               if (strcmp(name_hashtable[probe_address], key) == 0) {
+                       return(probe_address);
+               } else {
+                       probe_address -= probe_decrement;
+                       if ((int)probe_address < 0) {
+                               probe_address += NAME_HASH_PRIME;
+                       }
+               }
+       }
+       name_hashtable[probe_address] = bb_xstrdup(key);
+       return(probe_address);
+}
 
-       dependsvec[0] = 0;
-
-       if (dependsstr != 0)
-       {
-               p = strdup(dependsstr);
-               while (*p != 0 && *p != '\n')
-               {
-                       if (*p != ' ')
-                       {
-                               if (*p == ',')
-                               {
-                                       *p = 0;
-                                       dependsvec[++i] = 0;
-                               }
-                               else if (dependsvec[i] == 0)
-                                       dependsvec[i] = p;
+/* this DOESNT add the key to the hashtable
+ * TODO make it consistent with search_name_hashtable
+ */
+static unsigned int search_status_hashtable(const char *key)
+{
+       unsigned int probe_address = 0;
+       unsigned int probe_decrement = 0;
+
+       make_hash(key, &probe_address, &probe_decrement, STATUS_HASH_PRIME);
+       while(status_hashtable[probe_address] != NULL) {
+               if (strcmp(key, name_hashtable[package_hashtable[status_hashtable[probe_address]->package]->name]) == 0) {
+                       break;
+               } else {
+                       probe_address -= probe_decrement;
+                       if ((int)probe_address < 0) {
+                               probe_address += STATUS_HASH_PRIME;
                        }
-                       else
-                               *p = 0; /* eat the space... */
-                       p++;
                }
-               *p = 0;
        }
-       dependsvec[i+1] = 0;
-       return dependsvec;
+       return(probe_address);
 }
 
-static void depends_sort_visit(package_t **ordered, package_t *pkgs,
-               package_t *pkg)
+/* Need to rethink version comparison, maybe the official dpkg has something i can use ? */
+static int version_compare_part(const char *version1, const char *version2)
 {
-       /* Topological sort algorithm:
-        * ordered is the output list, pkgs is the dependency graph, pkg is 
-        * the current node
-        *
-        * recursively add all the adjacent nodes to the ordered list, marking
-        * each one as visited along the way
-        *
-        * yes, this algorithm looks a bit odd when all the params have the
-        * same type :-)
-        */
-       unsigned short i;
+       int upstream_len1 = 0;
+       int upstream_len2 = 0;
+       char *name1_char;
+       char *name2_char;
+       int len1 = 0;
+       int len2 = 0;
+       int tmp_int;
+       int ver_num1;
+       int ver_num2;
+       int ret;
+
+       if (version1 == NULL) {
+               version1 = bb_xstrdup("");
+       }
+       if (version2 == NULL) {
+               version2 = bb_xstrdup("");
+       }
+       upstream_len1 = strlen(version1);
+       upstream_len2 = strlen(version2);
+
+       while ((len1 < upstream_len1) || (len2 < upstream_len2)) {
+               /* Compare non-digit section */
+               tmp_int = strcspn(&version1[len1], "0123456789");
+               name1_char = bb_xstrndup(&version1[len1], tmp_int);
+               len1 += tmp_int;
+               tmp_int = strcspn(&version2[len2], "0123456789");
+               name2_char = bb_xstrndup(&version2[len2], tmp_int);
+               len2 += tmp_int;
+               tmp_int = strcmp(name1_char, name2_char);
+               free(name1_char);
+               free(name2_char);
+               if (tmp_int != 0) {
+                       ret = tmp_int;
+                       goto cleanup_version_compare_part;
+               }
 
-       /* mark node as processing */
-       pkg->color = color_grey;
-
-       /* visit each not-yet-visited node */
-       for (i = 0; i < pkg->requiredcount; i++)
-               if (pkg->requiredfor[i]->color == color_white)
-                       depends_sort_visit(ordered, pkgs, pkg->requiredfor[i]);
-
-#if 0
-       /* add it to the list */
-       newnode = (struct package_t *)malloc(sizeof(struct package_t));
-       /* make a shallow copy */
-       *newnode = *pkg;
-       newnode->next = *ordered;
-       *ordered = newnode;
-#endif
-       pkg->next = *ordered;
-       *ordered = pkg;
+               /* Compare digits */
+               tmp_int = strspn(&version1[len1], "0123456789");
+               name1_char = bb_xstrndup(&version1[len1], tmp_int);
+               len1 += tmp_int;
+               tmp_int = strspn(&version2[len2], "0123456789");
+               name2_char = bb_xstrndup(&version2[len2], tmp_int);
+               len2 += tmp_int;
+               ver_num1 = atoi(name1_char);
+               ver_num2 = atoi(name2_char);
+               free(name1_char);
+               free(name2_char);
+               if (ver_num1 < ver_num2) {
+                       ret = -1;
+                       goto cleanup_version_compare_part;
+               }
+               else if (ver_num1 > ver_num2) {
+                       ret = 1;
+                       goto cleanup_version_compare_part;
+               }
+       }
+       ret = 0;
+cleanup_version_compare_part:
+       return(ret);
+}
+
+/* if ver1 < ver2 return -1,
+ * if ver1 = ver2 return 0,
+ * if ver1 > ver2 return 1,
+ */
+static int version_compare(const unsigned int ver1, const unsigned int ver2)
+{
+       char *ch_ver1 = name_hashtable[ver1];
+       char *ch_ver2 = name_hashtable[ver2];
+
+       char epoch1, epoch2;
+       char *deb_ver1, *deb_ver2;
+       char *ver1_ptr, *ver2_ptr;
+       char *upstream_ver1;
+       char *upstream_ver2;
+       int result;
+
+       /* Compare epoch */
+       if (ch_ver1[1] == ':') {
+               epoch1 = ch_ver1[0];
+               ver1_ptr = strchr(ch_ver1, ':') + 1;
+       } else {
+               epoch1 = '0';
+               ver1_ptr = ch_ver1;
+       }
+       if (ch_ver2[1] == ':') {
+               epoch2 = ch_ver2[0];
+               ver2_ptr = strchr(ch_ver2, ':') + 1;
+       } else {
+               epoch2 = '0';
+               ver2_ptr = ch_ver2;
+       }
+       if (epoch1 < epoch2) {
+               return(-1);
+       }
+       else if (epoch1 > epoch2) {
+               return(1);
+       }
+
+       /* Compare upstream version */
+       upstream_ver1 = bb_xstrdup(ver1_ptr);
+       upstream_ver2 = bb_xstrdup(ver2_ptr);
 
-       /* mark node as done */
-       pkg->color = color_black;
+       /* Chop off debian version, and store for later use */
+       deb_ver1 = strrchr(upstream_ver1, '-');
+       deb_ver2 = strrchr(upstream_ver2, '-');
+       if (deb_ver1) {
+               deb_ver1[0] = '\0';
+               deb_ver1++;
+       }
+       if (deb_ver2) {
+               deb_ver2[0] = '\0';
+               deb_ver2++;
+       }
+       result = version_compare_part(upstream_ver1, upstream_ver2);
+
+       free(upstream_ver1);
+       free(upstream_ver2);
+
+       if (result != 0) {
+               return(result);
+       }
+
+       /* Compare debian versions */
+       return(version_compare_part(deb_ver1, deb_ver2));
 }
 
-static package_t *depends_sort(package_t *pkgs)
+static int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator)
 {
-       /* TODO: it needs to break cycles in the to-be-installed package 
-        * graph... */
-       package_t *ordered = NULL;
-       package_t *pkg;
+       const int version_result = version_compare(version1, version2);
+       switch(operator) {
+               case (VER_ANY):
+                       return(TRUE);
+               case (VER_EQUAL):
+                       if (version_result == 0) {
+                               return(TRUE);
+                       }
+                       break;
+               case (VER_LESS):
+                       if (version_result < 0) {
+                               return(TRUE);
+                       }
+                       break;
+               case (VER_LESS_EQUAL):
+                       if (version_result <= 0) {
+                               return(TRUE);
+                       }
+                       break;
+               case (VER_MORE):
+                       if (version_result > 0) {
+                               return(TRUE);
+                       }
+                       break;
+               case (VER_MORE_EQUAL):
+                       if (version_result >= 0) {
+                               return(TRUE);
+                       }
+                       break;
+       }
+       return(FALSE);
+}
 
-       for (pkg = pkgs; pkg != 0; pkg = pkg->next)
-               pkg->color = color_white;
 
-       for (pkg = pkgs; pkg != 0; pkg = pkg->next)
-               if (pkg->color == color_white)
-                       depends_sort_visit(&ordered, pkgs, pkg);
+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;
+
+       make_hash(name_hashtable[name], &probe_address, &probe_decrement, PACKAGE_HASH_PRIME);
+       while(package_hashtable[probe_address] != NULL) {
+               if (package_hashtable[probe_address]->name == name) {
+                       if (operator == VER_ANY) {
+                               return(probe_address);
+                       }
+                       if (test_version(package_hashtable[probe_address]->version, version, operator)) {
+                               return(probe_address);
+                       }
+               }
+               probe_address -= probe_decrement;
+               if ((int)probe_address < 0) {
+                       probe_address += PACKAGE_HASH_PRIME;
+               }
+       }
+       return(probe_address);
+}
 
-       /* Leaks the old list... return the new one... */
-       return ordered;
+/*
+ * 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 providing package.
+ *
+ * needle is the index into name_hashtable of the package we are
+ * looking for.
+ *
+ * start_at is the index in the package_hashtable to start looking
+ * at. If start_at is -1 then start at the beginning. This is to allow
+ * for repeated searches since more than one package might provide
+ * needle.
+ *
+ * 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.
+ */
+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++) {
+               p = package_hashtable[i];
+               if ( p == NULL ) continue;
+               for(j = 0; j < p->num_of_edges; j++)
+                       if ( p->edge[j]->type == EDGE_PROVIDES && p->edge[j]->name == needle )
+                               return i;
+       }
+       return -1;
 }
 
+/*
+ * Add an edge to a node
+ */
+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));
+       node->edge[node->num_of_edges - 1] = edge;
+}
 
-/* resolve package dependencies -- 
- * for each package in the list of packages to be installed, we parse its 
- * dependency info to determine if the dependent packages are either 
- * already installed, or are scheduled to be installed. If both tests fail
- * than bail.
+/*
+ * Create one new node and one new edge for every dependency.
  *
- * The algorithm here is O(n^2*m) where n = number of packages to be 
- * installed and m is the # of dependencies per package. Not a terribly
- * efficient algorithm, but given that at any one time you are unlikely
- * to install a very large number of packages it doesn't really matter
+ * Dependencies which contain multiple alternatives are represented as
+ * an EDGE_OR_PRE_DEPENDS or EDGE_OR_DEPENDS node, followed by a
+ * number of EDGE_PRE_DEPENDS or EDGE_DEPENDS nodes. The name field of
+ * the OR edge contains the full dependency string while the version
+ * field contains the number of EDGE nodes which follow as part of
+ * this alternative.
  */
-static package_t *depends_resolve(package_t *pkgs, void *status)
+static void add_split_dependencies(common_node_t *parent_node, const char *whole_line, unsigned int edge_type)
 {
-       package_t *pkg, *chk;
-       package_t dependpkg;
-       char **dependsvec;
-       int i;
-       void *found;
-
-       for (pkg = pkgs; pkg != 0; pkg = pkg->next)
-       {
-               dependsvec = depends_split(pkg->depends);
-               i = 0;
-               while (dependsvec[i] != 0)
-               {
-                       /* Check for dependencies; first look for installed packages */
-                       dependpkg.package = dependsvec[i];
-                       if ((found = tfind(&dependpkg, &status, package_compare)) == 0 ||
-                           ((chk = *(package_t **)found) &&
-                            (chk->status & (status_flagok | status_statusinstalled)) != 
-                             (status_flagok | status_statusinstalled)))
-                       {
-                               /* if it fails, we look through the list of packages we are going to 
-                                * install */
-                               for (chk = pkgs; chk != 0; chk = chk->next)
-                               {
-                                       if (strcmp(chk->package, dependsvec[i]) == 0 ||
-                                           (chk->provides && 
-                                            strncmp(chk->provides, dependsvec[i], strlen(dependsvec[i])) == 0))
-                                       {
-                                               if (chk->requiredcount >= DEPENDSMAX)
-                                               {
-                                                       fprintf(stderr, "Too many dependencies for %s\n", 
-                                                               chk->package);
-                                                       return 0;
-                                               }
-                                               if (chk != pkg)
-                                                       chk->requiredfor[chk->requiredcount++] = pkg;
-                                               break;
+       char *line = bb_xstrdup(whole_line);
+       char *line2;
+       char *line_ptr1 = NULL;
+       char *line_ptr2 = NULL;
+       char *field;
+       char *field2;
+       char *version;
+       edge_t *edge;
+       edge_t *or_edge;
+       int offset_ch;
+
+       field = strtok_r(line, ",", &line_ptr1);
+       do {
+               /* skip leading spaces */
+               field += strspn(field, " ");
+               line2 = bb_xstrdup(field);
+               field2 = strtok_r(line2, "|", &line_ptr2);
+               if ( (edge_type == EDGE_DEPENDS || edge_type == EDGE_PRE_DEPENDS) &&
+                    (strcmp(field, field2) != 0)) {
+                       or_edge = (edge_t *)xmalloc(sizeof(edge_t));
+                       or_edge->type = edge_type + 1;
+               } 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);
+               }
+
+               do {
+                       edge = (edge_t *) xmalloc(sizeof(edge_t));
+                       edge->type = edge_type;
+
+                       /* Skip any extra leading spaces */
+                       field2 += strspn(field2, " ");
+
+                       /* Get dependency version info */
+                       version = strchr(field2, '(');
+                       if (version == NULL) {
+                               edge->operator = VER_ANY;
+                               /* Get the versions hash number, adding it if the number isnt already in there */
+                               edge->version = search_name_hashtable("ANY");
+                       } else {
+                               /* Skip leading ' ' or '(' */
+                               version += strspn(field2, " ");
+                               version += strspn(version, "(");
+                               /* Calculate length of any operator characters */
+                               offset_ch = strspn(version, "<=>");
+                               /* Determine operator */
+                               if (offset_ch > 0) {
+                                       if (strncmp(version, "=", offset_ch) == 0) {
+                                               edge->operator = VER_EQUAL;
+                                       }
+                                       else if (strncmp(version, "<<", offset_ch) == 0) {
+                                               edge->operator = VER_LESS;
+                                       }
+                                       else if (strncmp(version, "<=", offset_ch) == 0) {
+                                               edge->operator = VER_LESS_EQUAL;
+                                       }
+                                       else if (strncmp(version, ">>", offset_ch) == 0) {
+                                               edge->operator = VER_MORE;
+                                       }
+                                       else if (strncmp(version, ">=", offset_ch) == 0) {
+                                               edge->operator = VER_MORE_EQUAL;
+                                       } else {
+                                               bb_error_msg_and_die("Illegal operator\n");
                                        }
                                }
-                               if (chk == 0)
-                               {
-                                       fprintf(stderr, "%s depends on %s, but it is not going to be installed\n", pkg->package, dependsvec[i]);
-                                       return 0;
-                               }
+                               /* skip to start of version numbers */
+                               version += offset_ch;
+                               version += strspn(version, " ");
+
+                               /* Truncate version at trailing ' ' or ')' */
+                               version[strcspn(version, " )")] = '\0';
+                               /* Get the versions hash number, adding it if the number isnt already in there */
+                               edge->version = search_name_hashtable(version);
                        }
-                       i++;
-               }
-       }
 
-       return depends_sort(pkgs);
+                       /* Get the dependency name */
+                       field2[strcspn(field2, " (")] = '\0';
+                       edge->name = search_name_hashtable(field2);
+
+                       if ( or_edge )
+                               or_edge->version++;
+
+                       add_edge_to_node(parent_node, edge);
+               } while ((field2 = strtok_r(NULL, "|", &line_ptr2)) != NULL);
+               free(line2);
+       } while ((field = strtok_r(NULL, ",", &line_ptr1)) != NULL);
+       free(line);
+
+       return;
 }
-#endif
 
-/* Status file handling routines
- * 
- * This is a fairly minimalistic implementation. there are two main functions 
- * that are supported:
- * 
- * 1) reading the entire status file:
- *    the status file is read into memory as a binary-tree, with just the 
- *    package and status info preserved
- *
- * 2) merging the status file
- *    control info from (new) packages is merged into the status file, 
- *    replacing any pre-existing entries. when a merge happens, status info 
- *    read using the status_read function is written back to the status file
- */
+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]);
+               }
+               free(node->edge);
+               free(node);
+       }
+}
 
-static unsigned long status_parse(const char *line)
+static unsigned int fill_package_struct(char *control_buffer)
 {
-       char *p;
-       int i, j;
-       unsigned long l = 0;
-       for (i = 0; i < 3; i++)
-       {
-               p = strchr(line, ' ');
-               if (p) *p = 0; 
-               j = 1;
-               while (statuswords[i][j] != 0) 
-               {
-                       if (strcmp(line, statuswords[i][j]) == 0) 
-                       {
-                               l |= (1 << ((int)statuswords[i][0] + j - 1));
+       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 *) xzalloc(sizeof(common_node_t));
+       char *field_name;
+       char *field_value;
+       int field_start = 0;
+       int num = -1;
+       int buffer_length = strlen(control_buffer);
+
+       new_node->version = search_name_hashtable("unknown");
+       while (field_start < buffer_length) {
+               unsigned short field_num;
+
+               field_start += read_package_field(&control_buffer[field_start],
+                               &field_name, &field_value);
+
+               if (field_name == NULL) {
+                       goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement ! */
+               }
+
+               field_num = compare_string_array(field_names, field_name);
+               switch(field_num) {
+                       case 0: /* Package */
+                               new_node->name = search_name_hashtable(field_value);
+                               break;
+                       case 1: /* Version */
+                               new_node->version = search_name_hashtable(field_value);
+                               break;
+                       case 2: /* Pre-Depends */
+                               add_split_dependencies(new_node, field_value, EDGE_PRE_DEPENDS);
+                               break;
+                       case 3: /* Depends */
+                               add_split_dependencies(new_node, field_value, EDGE_DEPENDS);
+                               break;
+                       case 4: /* Replaces */
+                               add_split_dependencies(new_node, field_value, EDGE_REPLACES);
+                               break;
+                       case 5: /* Provides */
+                               add_split_dependencies(new_node, field_value, EDGE_PROVIDES);
+                               break;
+                       case 6: /* Conflicts */
+                               add_split_dependencies(new_node, field_value, EDGE_CONFLICTS);
+                               break;
+                       case 7: /* Suggests */
+                               add_split_dependencies(new_node, field_value, EDGE_SUGGESTS);
+                               break;
+                       case 8: /* Recommends */
+                               add_split_dependencies(new_node, field_value, EDGE_RECOMMENDS);
+                               break;
+                       case 9: /* Enhances */
+                               add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
                                break;
-                       }
-                       j++;
                }
-               if (statuswords[i][j] == 0) return 0; /* parse error */
-               line = p+1;
+fill_package_struct_cleanup:
+               free(field_name);
+               free(field_value);
        }
-       return l;
+
+       if (new_node->version == search_name_hashtable("unknown")) {
+               free_package(new_node);
+               return(-1);
+       }
+       num = search_package_hashtable(new_node->name, new_node->version, VER_EQUAL);
+       if (package_hashtable[num] == NULL) {
+               package_hashtable[num] = new_node;
+       } else {
+               free_package(new_node);
+       }
+       return(num);
 }
 
-static const char *status_print(unsigned long flags)
+/* if num = 1, it returns the want status, 2 returns flag, 3 returns status */
+static unsigned int get_status(const unsigned int status_node, const int num)
 {
-       /* this function returns a static buffer... */
-       static char buf[256];
-       int i, j;
+       char *status_string = name_hashtable[status_hashtable[status_node]->status];
+       char *state_sub_string;
+       unsigned int state_sub_num;
+       int len;
+       int i;
 
-       buf[0] = 0;
-       for (i = 0; i < 3; i++)
-       {
-               j = 1;
-               while (statuswords[i][j] != 0)
-               {
-                       if ((flags & (1 << ((int)statuswords[i][0] + j - 1))) != 0)
-                       {
-                               strcat(buf, statuswords[i][j]);
-                               if (i < 2) strcat(buf, " ");
-                               break;
+       /* set tmp_string to point to the start of the word number */
+       for (i = 1; i < num; i++) {
+               /* skip past a word */
+               status_string += strcspn(status_string, " ");
+               /* skip past the separating spaces */
+               status_string += strspn(status_string, " ");
+       }
+       len = strcspn(status_string, " \n\0");
+       state_sub_string = bb_xstrndup(status_string, len);
+       state_sub_num = search_name_hashtable(state_sub_string);
+       free(state_sub_string);
+       return(state_sub_num);
+}
+
+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);
+       unsigned int want = get_status(status_node_num, 1);
+       unsigned int flag = get_status(status_node_num, 2);
+       unsigned int 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");
+       }
+
+       new_status = bb_xasprintf("%s %s %s", name_hashtable[want], name_hashtable[flag], name_hashtable[status]);
+       status_hashtable[status_node_num]->status = search_name_hashtable(new_status);
+       free(new_status);
+       return;
+}
+
+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";
+
+       status_want = get_status(status_num, 1);
+       status_state = get_status(status_num, 3);
+
+       if ( status_state == search_name_hashtable("installed") ) {
+               if ( status_want == search_name_hashtable("install") )
+                       return "is installed";
+               if ( status_want == search_name_hashtable("deinstall") )
+                       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") )
+               return "is marked to be installed";
+
+       return "is not installed or flagged to be installed";
+}
+
+
+static void index_status_file(const char *filename)
+{
+       FILE *status_file;
+       char *control_buffer;
+       char *status_line;
+       status_node_t *status_node = NULL;
+       unsigned int status_num;
+
+       status_file = bb_xfopen(filename, "r");
+       while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) {
+               const unsigned int package_num = fill_package_struct(control_buffer);
+               if (package_num != -1) {
+                       status_node = xmalloc(sizeof(status_node_t));
+                       /* fill_package_struct doesnt handle the status field */
+                       status_line = strstr(control_buffer, "Status:");
+                       if (status_line != NULL) {
+                               status_line += 7;
+                               status_line += strspn(status_line, " \n\t");
+                               status_line = bb_xstrndup(status_line, strcspn(status_line, "\n\0"));
+                               status_node->status = search_name_hashtable(status_line);
+                               free(status_line);
                        }
-                       j++;
-               }
-               if (statuswords[i][j] == 0)
-               {
-                       fprintf(stderr, "corrupted status flag!!\n");
-                       return NULL;
+                       status_node->package = package_num;
+                       status_num = search_status_hashtable(name_hashtable[package_hashtable[status_node->package]->name]);
+                       status_hashtable[status_num] = status_node;
                }
+               free(control_buffer);
        }
-       return buf;
+       fclose(status_file);
+       return;
 }
 
-/*
- * Read a control file (or a stanza of a status file) and parse it,
- * filling parsed fields into the package structure
- */
-static void control_read(FILE *f, package_t *p)
+static void write_buffer_no_status(FILE *new_status_file, const char *control_buffer)
 {
-       char buf[BUFSIZE];
-       while (fgets(buf, BUFSIZE, f) && !feof(f))
-       {
-               buf[strlen(buf)-1] = 0;
-               if (*buf == 0)
-                       return;
-               else if (strstr(buf, "Package: ") == buf)
-               {
-                       p->package = strdup(buf+9);
+       char *name;
+       char *value;
+       int start = 0;
+       while (1) {
+               start += read_package_field(&control_buffer[start], &name, &value);
+               if (name == NULL) {
+                       break;
                }
-               else if (strstr(buf, "Status: ") == buf)
-               {
-                       p->status = status_parse(buf+8);
+               if (strcmp(name, "Status") != 0) {
+                       fprintf(new_status_file, "%s: %s\n", name, value);
                }
-               else if (strstr(buf, "Depends: ") == buf)
-               {
-                       p->depends = strdup(buf+9);
+       }
+       return;
+}
+
+/* This could do with a cleanup */
+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");
+       char *package_name;
+       char *status_from_file;
+       char *control_buffer = NULL;
+       char *tmp_string;
+       int status_num;
+       int field_start = 0;
+       int write_flag;
+       int i = 0;
+
+       /* Update previously known packages */
+       while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) {
+               if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) {
+                       continue;
                }
-               else if (strstr(buf, "Provides: ") == buf)
-               {
-                       p->provides = strdup(buf+10);
+
+               tmp_string += 8;
+               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:");
+               if (tmp_string != NULL) {
+                       /* Seperate the status value from the control buffer */
+                       tmp_string += 7;
+                       tmp_string += strspn(tmp_string, " \n\t");
+                       status_from_file = bb_xstrndup(tmp_string, strcspn(tmp_string, "\n"));
+               } else {
+                       status_from_file = NULL;
                }
-               /* This is specific to the Debian Installer. Ifdef? */
-               else if (strstr(buf, "installer-menu-item: ") == buf) 
-               {
-                       p->installer_menu_item = atoi(buf+21);
+
+               /* Find this package in the status hashtable */
+               status_num = search_status_hashtable(package_name);
+               if (status_hashtable[status_num] != NULL) {
+                       const char *status_from_hashtable = name_hashtable[status_hashtable[status_num]->status];
+                       if (strcmp(status_from_file, status_from_hashtable) != 0) {
+                               /* New status isnt exactly the same as old status */
+                               const int state_status = get_status(status_num, 3);
+                               if ((strcmp("installed", name_hashtable[state_status]) == 0) ||
+                                       (strcmp("unpacked", name_hashtable[state_status]) == 0)) {
+                                       /* We need to add the control file from the package */
+                                       i = 0;
+                                       while(deb_file[i] != NULL) {
+                                               if (strcmp(package_name, name_hashtable[package_hashtable[deb_file[i]->package]->name]) == 0) {
+                                                       /* Write a status file entry with a modified status */
+                                                       /* remove trailing \n's */
+                                                       write_buffer_no_status(new_status_file, deb_file[i]->control_file);
+                                                       set_status(status_num, "ok", 2);
+                                                       fprintf(new_status_file, "Status: %s\n\n", name_hashtable[status_hashtable[status_num]->status]);
+                                                       write_flag = TRUE;
+                                                       break;
+                                               }
+                                               i++;
+                                       }
+                                       /* This is temperary, debugging only */
+                                       if (deb_file[i] == NULL) {
+                                               bb_error_msg_and_die("ALERT: Couldnt find a control file, your status file may be broken, status may be incorrect for %s", package_name);
+                                       }
+                               }
+                               else if (strcmp("not-installed", name_hashtable[state_status]) == 0) {
+                                       /* Only write the Package, Status, Priority and Section lines */
+                                       fprintf(new_status_file, "Package: %s\n", package_name);
+                                       fprintf(new_status_file, "Status: %s\n", status_from_hashtable);
+
+                                       while (1) {
+                                               char *field_name;
+                                               char *field_value;
+                                               field_start += read_package_field(&control_buffer[field_start], &field_name, &field_value);
+                                               if (field_name == NULL) {
+                                                       break;
+                                               }
+                                               if ((strcmp(field_name, "Priority") == 0) ||
+                                                       (strcmp(field_name, "Section") == 0)) {
+                                                       fprintf(new_status_file, "%s: %s\n", field_name, field_value);
+                                               }
+                                       }
+                                       write_flag = TRUE;
+                                       fputs("\n", new_status_file);
+                               }
+                               else if (strcmp("config-files", name_hashtable[state_status]) == 0) {
+                                       /* only change the status line */
+                                       while (1) {
+                                               char *field_name;
+                                               char *field_value;
+                                               field_start += read_package_field(&control_buffer[field_start], &field_name, &field_value);
+                                               if (field_name == NULL) {
+                                                       break;
+                                               }
+                                               /* Setup start point for next field */
+                                               if (strcmp(field_name, "Status") == 0) {
+                                                       fprintf(new_status_file, "Status: %s\n", status_from_hashtable);
+                                               } else {
+                                                       fprintf(new_status_file, "%s: %s\n", field_name, field_value);
+                                               }
+                                       }
+                                       write_flag = TRUE;
+                                       fputs("\n", new_status_file);
+                               }
+                       }
                }
-               else if (strstr(buf, "Description: ") == buf)
-               {
-                       p->description = strdup(buf+13);
+               /* If the package from the status file wasnt handle above, do it now*/
+               if (! write_flag) {
+                       fprintf(new_status_file, "%s\n\n", control_buffer);
                }
-               /* TODO: localized descriptions */
+
+               free(status_from_file);
+               free(package_name);
+               free(control_buffer);
+       }
+
+       /* Write any new packages */
+       for(i = 0; deb_file[i] != NULL; i++) {
+               status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[i]->package]->name]);
+               if (strcmp("reinstreq", name_hashtable[get_status(status_num, 2)]) == 0) {
+                       write_buffer_no_status(new_status_file, deb_file[i]->control_file);
+                       set_status(status_num, "ok", 2);
+                       fprintf(new_status_file, "Status: %s\n\n", name_hashtable[status_hashtable[status_num]->status]);
+               }
+       }
+       fclose(old_status_file);
+       fclose(new_status_file);
+
+
+       /* Create a separate backfile to dpkg */
+       if (rename("/var/lib/dpkg/status", "/var/lib/dpkg/status.udeb.bak") == -1) {
+               struct stat stat_buf;
+               xstat("/var/lib/dpkg/status", &stat_buf);
+               /* 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");
+       }
+
+       if (rename("/var/lib/dpkg/status.udeb", "/var/lib/dpkg/status") == -1) {
+               bb_error_msg_and_die("DANGER: Couldnt create status file, you need to manually repair your status file");
        }
 }
 
-static void *status_read(void)
+/* This function returns TRUE if the given package can satisfy a
+ * dependency of type depend_type.
+ *
+ * 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.
+ */
+static int package_satisfies_dependency(int package, int depend_type)
 {
-       FILE *f;
-       void *status = 0;
-       package_t *m = 0, *p = 0, *t = 0;
+       int status_num = search_status_hashtable(name_hashtable[package_hashtable[package]->name]);
 
-       if ((f = fopen(STATUSFILE, "r")) == NULL)
-       {
-               perror(STATUSFILE);
+       /* status could be unknown if package is a pure virtual
+        * provides which cannot satisfy any dependency by itself.
+        */
+       if ( status_hashtable[status_num] == NULL )
                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");
+       }
+       return 0;
+}
+
+static int check_deps(deb_file_t **deb_file, int deb_start, int dep_max_count)
+{
+       int *conflicts = NULL;
+       int conflicts_num = 0;
+       int i = deb_start;
+       int j;
+
+       /* Check for conflicts
+        * TODO: TEST if conflicts with other packages to be installed
+        *
+        * Add install packages and the packages they provide
+        * to the list of files to check conflicts for
+        */
+
+       /* Create array of package numbers to check against
+        * installed package for conflicts*/
+       while (deb_file[i] != NULL) {
+               const unsigned int package_num = deb_file[i]->package;
+               conflicts = xrealloc(conflicts, sizeof(int) * (conflicts_num + 1));
+               conflicts[conflicts_num] = package_num;
+               conflicts_num++;
+               /* add provides to conflicts list */
+               for (j = 0; j < package_hashtable[package_num]->num_of_edges; j++) {
+                       if (package_hashtable[package_num]->edge[j]->type == EDGE_PROVIDES) {
+                               const int conflicts_package_num = search_package_hashtable(
+                                       package_hashtable[package_num]->edge[j]->name,
+                                       package_hashtable[package_num]->edge[j]->version,
+                                       package_hashtable[package_num]->edge[j]->operator);
+                               if (package_hashtable[conflicts_package_num] == NULL) {
+                                       /* create a new package */
+                                       common_node_t *new_node = (common_node_t *) xzalloc(sizeof(common_node_t));
+                                       new_node->name = package_hashtable[package_num]->edge[j]->name;
+                                       new_node->version = package_hashtable[package_num]->edge[j]->version;
+                                       package_hashtable[conflicts_package_num] = new_node;
+                               }
+                               conflicts = xrealloc(conflicts, sizeof(int) * (conflicts_num + 1));
+                               conflicts[conflicts_num] = conflicts_package_num;
+                               conflicts_num++;
+                       }
+               }
+               i++;
+       }
+
+       /* Check conflicts */
+       i = 0;
+       while (deb_file[i] != NULL) {
+               const common_node_t *package_node = package_hashtable[deb_file[i]->package];
+               int status_num = 0;
+               status_num = search_status_hashtable(name_hashtable[package_node->name]);
+
+               if (get_status(status_num, 3) == search_name_hashtable("installed")) {
+                       i++;
+                       continue;
+               }
+
+               for (j = 0; j < package_node->num_of_edges; j++) {
+                       const edge_t *package_edge = package_node->edge[j];
+
+                       if (package_edge->type == EDGE_CONFLICTS) {
+                               const unsigned int package_num =
+                                       search_package_hashtable(package_edge->name,
+                                                                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]);
+
+                                       if (get_status(status_num, 1) == search_name_hashtable("install")) {
+                                               result = test_version(package_hashtable[deb_file[i]->package]->version,
+                                                       package_edge->version, package_edge->operator);
+                                       }
+                               }
+
+                               if (result) {
+                                       bb_error_msg_and_die("Package %s conflicts with %s",
+                                               name_hashtable[package_node->name],
+                                               name_hashtable[package_edge->name]);
+                               }
+                       }
+               }
+               i++;
        }
-       if (getenv(udpkg_quiet) == NULL)
-               printf("(Reading database...)\n");
-       while (!feof(f))
-       {
-               m = (package_t *)malloc(sizeof(package_t));
-               memset(m, 0, sizeof(package_t));
-               control_read(f, m);
-               if (m->package)
-               {
-                       /*
-                        * If there is an item in the tree by this name,
-                        * it must be a virtual package; insert real
-                        * package in preference.
-                        */
-                       tdelete(m, &status, package_compare);
-                       tsearch(m, &status, package_compare);
-                       if (m->provides)
-                       {
-                               /* 
-                                * A "Provides" triggers the insertion
-                                * of a pseudo package into the status
-                                * binary-tree.
+
+
+       /* 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 = NULL;
+               const common_node_t *package_node = package_hashtable[i];
+
+               /* If the package node does not exist then this
+                * package is a virtual one. In which case there are
+                * no dependencies to check.
+                */
+               if ( package_node == NULL ) continue;
+
+               status_num = search_status_hashtable(name_hashtable[package_node->name]);
+
+               /* 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.
+                */
+               if ( status_hashtable[status_num] == NULL ) continue;
+
+               /* If we don't want this package installed then we may
+                * as well ignore it's dependencies.
+                */
+               if (get_status(status_num, 1) != search_name_hashtable("install")) {
+                       continue;
+               }
+
+               /* 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 */
+                               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 */
+                               number_of_alternatives = 1;
+                               root_of_alternatives = NULL;
+                       }
+
+                       package_num = search_package_hashtable(package_edge->name, package_edge->version, package_edge->operator);
+
+                       if (package_edge->type == EDGE_PRE_DEPENDS ||
+                           package_edge->type == EDGE_DEPENDS ) {
+                               int result=1;
+                               status_num = 0;
+
+                               /* If we are inside an alternative then check
+                                * this edge is the right type.
+                                *
+                                * EDGE_DEPENDS == OR_DEPENDS -1
+                                * EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1
                                 */
-                               p = (package_t *)malloc(sizeof(package_t));
-                               memset(p, 0, sizeof(package_t));
-                               p->package = strdup(m->provides);
-
-                               t = *(package_t **)tsearch(p, &status, package_compare);
-                               if (!(t == p))
-                               {
-                                       free(p->package);
-                                       free(p);
+                               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 )
+                                                       break;
+                                       }
                                }
-                               else {
-                                       /*
-                                        * Pseudo package status is the
-                                        * same as the status of the
-                                        * package providing it 
-                                        * FIXME: (not quite right, if 2
-                                        * packages of different statuses
-                                        * provide it).
+
+                               /* It must be already installed, or to be installed */
+                               number_of_alternatives--;
+                               if (result && number_of_alternatives == 0) {
+                                       if ( root_of_alternatives )
+                                               bb_error_msg_and_die(
+                                                       "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
+                                               bb_error_msg_and_die(
+                                                       "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],
+                                                       describe_status(status_num));
+                               } else if ( result == 0 && number_of_alternatives ) {
+                                       /* we've found a package which
+                                        * satisfies the dependency,
+                                        * so skip over the rest of
+                                        * the alternatives.
                                         */
-                                       t->status = m->status;
+                                       j += number_of_alternatives;
+                                       number_of_alternatives = 0;
                                }
                        }
                }
-               else
-               {
-                       free(m);
-               }
        }
-       fclose(f);
-       return status;
+       free(conflicts);
+       return(TRUE);
 }
 
-static int status_merge(void *status, package_t *pkgs)
+static char **create_list(const char *filename)
 {
-       FILE *fin, *fout;
-       char buf[BUFSIZE];
-       package_t *pkg = 0, *statpkg = 0;
-       package_t locpkg;
-       int r = 0;
+       FILE *list_stream;
+       char **file_list = NULL;
+       char *line = NULL;
+       int count = 0;
+
+       /* don't use [xw]fopen here, handle error ourself */
+       list_stream = fopen(filename, "r");
+       if (list_stream == NULL) {
+               return(NULL);
+       }
 
-       if ((fin = fopen(STATUSFILE, "r")) == NULL)
-       {
-               perror(STATUSFILE);
-               return 0;
+       while ((line = bb_get_chomped_line_from_file(list_stream)) != NULL) {
+               file_list = xrealloc(file_list, sizeof(char *) * (count + 2));
+               file_list[count] = line;
+               count++;
        }
-       if ((fout = fopen(STATUSFILE ".new", "w")) == NULL)
-       {
-               perror(STATUSFILE ".new");
-               return 0;
+       fclose(list_stream);
+
+       if (count == 0) {
+               return(NULL);
+       } else {
+               file_list[count] = NULL;
+               return(file_list);
        }
-       if (getenv(udpkg_quiet) == NULL)
-               printf("(Updating database...)\n");
-       while (fgets(buf, BUFSIZE, fin) && !feof(fin))
-       {
-               buf[strlen(buf)-1] = 0; /* trim newline */
-               /* If we see a package header, find out if it's a package
-                * that we have processed. if so, we skip that block for
-                * now (write it at the end).
-                *
-                * we also look at packages in the status cache and update
-                * their status fields
-                */
-               if (strstr(buf, "Package: ") == buf)
-               {
-                       for (pkg = pkgs; pkg != 0 && strncmp(buf + 9,
-                                       pkg->package, strlen(buf) - 9)!=0;
-                            pkg = pkg->next) ;
-
-                       locpkg.package = buf+9;
-                       statpkg = tfind(&locpkg, &status, package_compare);
-                       
-                       /* note: statpkg should be non-zero, unless the status
-                        * file was changed while we are processing (no locking
-                        * is currently done...
-                        */
-                       if (statpkg != 0) statpkg = *(package_t **)statpkg;
-               }
-               if (pkg != 0) continue;
-
-               if (strstr(buf, "Status: ") == buf && statpkg != 0)
-               {
-                         snprintf(buf, sizeof(buf), "Status: %s",
-                                status_print(statpkg->status));
-               }
-               fputs(buf, fout);
-               fputc('\n', fout);
-       }
-
-       // Print out packages we processed.
-       for (pkg = pkgs; pkg != 0; pkg = pkg->next) {
-               fprintf(fout, "Package: %s\nStatus: %s\n", 
-                       pkg->package, status_print(pkg->status));
-               if (pkg->depends)
-                       fprintf(fout, "Depends: %s\n", pkg->depends);
-               if (pkg->provides)
-                       fprintf(fout, "Provides: %s\n", pkg->provides);
-               if (pkg->installer_menu_item)
-                       fprintf(fout, "installer-menu-item: %i\n", pkg->installer_menu_item);
-               if (pkg->description)
-                       fprintf(fout, "Description: %s\n", pkg->description);
-               fputc('\n', fout);
-       }
-       
-       fclose(fin);
-       fclose(fout);
-
-       r = rename(STATUSFILE, STATUSFILE ".bak");
-       if (r == 0) r = rename(STATUSFILE ".new", STATUSFILE);
-       return 0;
 }
 
-/* 
- * Main udpkg implementation routines
- */
+/* maybe i should try and hook this into remove_file.c somehow */
+static int remove_file_array(char **remove_names, char **exclude_names)
+{
+       struct stat path_stat;
+       int match_flag;
+       int remove_flag = FALSE;
+       int i,j;
+
+       if (remove_names == NULL) {
+               return(FALSE);
+       }
+       for (i = 0; remove_names[i] != NULL; i++) {
+               match_flag = FALSE;
+               if (exclude_names != NULL) {
+                       for (j = 0; exclude_names[j] != 0; j++) {
+                               if (strcmp(remove_names[i], exclude_names[j]) == 0) {
+                                       match_flag = TRUE;
+                                       break;
+                               }
+                       }
+               }
+               if (!match_flag) {
+                       if (lstat(remove_names[i], &path_stat) < 0) {
+                               continue;
+                       }
+                       if (S_ISDIR(path_stat.st_mode)) {
+                               if (rmdir(remove_names[i]) != -1) {
+                                       remove_flag = TRUE;
+                               }
+                       } else {
+                               if (unlink(remove_names[i]) != -1) {
+                                       remove_flag = TRUE;
+                               }
+                       }
+               }
+       }
+       return(remove_flag);
+}
 
-#ifdef DODEBUG
-static int do_system(const char *cmd)
+static int run_package_script(const char *package_name, const char *script_type)
 {
-       DPRINTF("cmd is %s\n", cmd);
-       return system(cmd);
+       struct stat path_stat;
+       char *script_path;
+       int result;
+
+       script_path = bb_xasprintf("/var/lib/dpkg/info/%s.%s", package_name, script_type);
+
+       /* If the file doesnt exist is isnt a fatal */
+       result = lstat(script_path, &path_stat) < 0 ? EXIT_SUCCESS : system(script_path);
+       free(script_path);
+       return(result);
 }
-#else
-#define do_system(cmd) system(cmd)
-#endif
 
-static int is_file(const char *fn)
+static const char *all_control_files[] = {"preinst", "postinst", "prerm", "postrm",
+       "list", "md5sums", "shlibs", "conffiles", "config", "templates", NULL };
+
+static char **all_control_list(const char *package_name)
 {
-       struct stat statbuf;
+       unsigned short i = 0;
+       char **remove_files;
+
+       /* Create a list of all /var/lib/dpkg/info/<package> files */
+       remove_files = xzalloc(sizeof(all_control_files));
+       while (all_control_files[i]) {
+               remove_files[i] = bb_xasprintf("/var/lib/dpkg/info/%s.%s", package_name, all_control_files[i]);
+               i++;
+       }
 
-       if (stat(fn, &statbuf) < 0) return 0;
-       return S_ISREG(statbuf.st_mode);
+       return(remove_files);
 }
 
-static int dpkg_doconfigure(package_t *pkg)
+static void free_array(char **array)
 {
-       int r;
-       char postinst[1024];
-       char buf[1024];
-       DPRINTF("Configuring %s\n", pkg->package);
-       pkg->status &= status_statusmask;
-       snprintf(postinst, sizeof(postinst), "%s%s.postinst", infodir, pkg->package);
-       if (is_file(postinst))
-       {
-               snprintf(buf, sizeof(buf), "%s configure", postinst);
-               if ((r = do_system(buf)) != 0)
-               {
-                       fprintf(stderr, "postinst exited with status %d\n", r);
-                       pkg->status |= status_statushalfconfigured;
-                       return 1;
+
+       if (array) {
+               unsigned short i = 0;
+               while (array[i]) {
+                       free(array[i]);
+                       i++;
                }
+               free(array);
        }
-
-       pkg->status |= status_statusinstalled;
-       
-       return 0;
 }
 
-static int dpkg_dounpack(package_t *pkg)
+/* 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.
+ */
+static void list_packages(void)
 {
-       int r = 0;
-       char *cwd, *p;
-       FILE *infp, *outfp;
-       char buf[1024], buf2[1024];
        int i;
-       char *adminscripts[] = { "prerm", "postrm", "preinst", "postinst",
-                                "conffiles", "md5sums", "shlibs", 
-                                "templates" };
-
-       DPRINTF("Unpacking %s\n", pkg->package);
-
-       cwd = getcwd(0, 0);
-       chdir("/");
-       snprintf(buf, sizeof(buf), "ar -p %s data.tar.gz|zcat|tar -xf -", pkg->file);
-       if (SYSTEM(buf) == 0)
-       {
-               /* Installs the package scripts into the info directory */
-               for (i = 0; i < sizeof(adminscripts) / sizeof(adminscripts[0]);
-                    i++)
-               {
-                       snprintf(buf, sizeof(buf), "%s%s/%s",
-                               DPKGCIDIR, pkg->package, adminscripts[i]);
-                       snprintf(buf2, sizeof(buf), "%s%s.%s", 
-                               infodir, pkg->package, adminscripts[i]);
-                       if (copy_file(buf, buf2, TRUE, FALSE, FALSE) < 0)
-                       {
-                               fprintf(stderr, "Cannot copy %s to %s: %s\n", 
-                                       buf, buf2, strerror(errno));
-                               r = 1;
-                               break;
-                       }
-                       else
-                       {
-                               /* ugly hack to create the list file; should
-                                * probably do something more elegant
-                                *
-                                * why oh why does dpkg create the list file
-                                * so oddly...
-                                */
-                               snprintf(buf, sizeof(buf), 
-                                       "ar -p %s data.tar.gz|zcat|tar -tf -", 
-                                       pkg->file);
-                               snprintf(buf2, sizeof(buf2),
-                                       "%s%s.list", infodir, pkg->package);
-                               if ((infp = popen(buf, "r")) == NULL ||
-                                   (outfp = fopen(buf2, "w")) == NULL)
-                               {
-                                       fprintf(stderr, "Cannot create %s\n",
-                                               buf2);
-                                       r = 1;
-                                       break;
-                               }
-                               while (fgets(buf, sizeof(buf), infp) &&
-                                      !feof(infp))
-                               {
-                                       p = buf;
-                                       if (*p == '.') p++;
-                                       if (*p == '/' && *(p+1) == '\n')
-                                       {
-                                               *(p+1) = '.';
-                                               *(p+2) = '\n';
-                                               *(p+3) = 0;
-                                       }
-                                       if (p[strlen(p)-2] == '/')
-                                       {
-                                               p[strlen(p)-2] = '\n';
-                                               p[strlen(p)-1] = 0;
-                                       }
-                                       fputs(p, outfp);
-                               }
-                               fclose(infp);
-                               fclose(outfp);
-                       }
-               }
-               pkg->status &= status_wantmask;
-               pkg->status |= status_wantinstall;
-               pkg->status &= status_flagmask;
-               pkg->status |= status_flagok;
-               pkg->status &= status_statusmask;
-               if (r == 0)
-                       pkg->status |= status_statusunpacked;
-               else
-                       pkg->status |= status_statushalfinstalled;
-       }
-       chdir(cwd);
-       return r;
-}
-
-static int dpkg_doinstall(package_t *pkg)
-{
-       DPRINTF("Installing %s\n", pkg->package);
-       return (dpkg_dounpack(pkg) || dpkg_doconfigure(pkg));
-}
-
-static int dpkg_unpackcontrol(package_t *pkg)
-{
-       int r = 1;
-       char *cwd = 0;
-       char *p;
-       char buf[1024];
-       FILE *f;
-
-       p = strrchr(pkg->file, '/');
-       if (p) p++; else p = pkg->file;
-       p = pkg->package = strdup(p);
-       while (*p != 0 && *p != '_' && *p != '.') p++;
-       *p = 0;
-
-       cwd = getcwd(0, 0);
-       snprintf(buf, sizeof(buf), "%s%s", DPKGCIDIR, pkg->package);
-       DPRINTF("dir = %s\n", buf);
-       if (mkdir(buf, S_IRWXU) == 0 && chdir(buf) == 0)
-       {
-               snprintf(buf, sizeof(buf), "ar -p %s control.tar.gz|zcat|tar -xf -",
-                       pkg->file);
-               if (SYSTEM(buf) == 0)
-               {
-                       if ((f = fopen("control", "r")) != NULL) {
-                               control_read(f, pkg);
-                               r = 0;
+
+       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++) {
+
+               if (status_hashtable[i]) {
+                       const char *stat_str;  /* status string */
+                       const char *name_str;  /* package name */
+                       const char *vers_str;  /* version */
+                       char  s1, s2;          /* status abbreviations */
+                       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);
                }
+    }
+}
+
+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];
+       const unsigned int status_num = search_status_hashtable(package_name);
+       const int package_name_length = strlen(package_name);
+       char **remove_files;
+       char **exclude_files;
+       char list_name[package_name_length + 25];
+       char conffile_name[package_name_length + 30];
+       int return_value;
+
+       if ( noisy )
+               printf("Removing %s (%s) ...\n", package_name, package_version);
+
+       /* run prerm script */
+       return_value = run_package_script(package_name, "prerm");
+       if (return_value == -1) {
+               bb_error_msg_and_die("script failed, prerm failure");
        }
 
-       chdir(cwd);
-       free(cwd);
-       return r;
+       /* 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);
+
+       sprintf(conffile_name, "/var/lib/dpkg/info/%s.conffiles", package_name);
+       exclude_files = create_list(conffile_name);
+
+       /* Some directories cant be removed straight away, so do multiple passes */
+       while (remove_file_array(remove_files, exclude_files));
+       free_array(exclude_files);
+       free_array(remove_files);
+
+       /* Create a list of files in /var/lib/dpkg/info/<package>.* to keep  */
+       exclude_files = xzalloc(sizeof(char*) * 3);
+       exclude_files[0] = bb_xstrdup(conffile_name);
+       exclude_files[1] = bb_xasprintf("/var/lib/dpkg/info/%s.postrm", package_name);
+
+       /* Create a list of all /var/lib/dpkg/info/<package> files */
+       remove_files = all_control_list(package_name);
+
+       remove_file_array(remove_files, exclude_files);
+       free_array(remove_files);
+       free_array(exclude_files);
+
+       /* rename <package>.conffile to <package>.list */
+       rename(conffile_name, list_name);
+
+       /* Change package status */
+       set_status(status_num, "config-files", 3);
 }
 
-static int dpkg_unpack(package_t *pkgs)
+static void purge_package(const unsigned int package_num)
 {
-       int r = 0;
-       package_t *pkg;
-       void *status = status_read();
-
-       if (SYSTEM("rm -rf -- " DPKGCIDIR) != 0 ||
-           mkdir(DPKGCIDIR, S_IRWXU) != 0)
-       {
-               perror("mkdir");
-               return 1;
+       const char *package_name = name_hashtable[package_hashtable[package_num]->name];
+       const char *package_version = name_hashtable[package_hashtable[package_num]->version];
+       const unsigned int status_num = search_status_hashtable(package_name);
+       char **remove_files;
+       char **exclude_files;
+       char list_name[strlen(package_name) + 25];
+
+       printf("Purging %s (%s) ...\n", package_name, package_version);
+
+       /* run prerm script */
+       if (run_package_script(package_name, "prerm") != 0) {
+               bb_error_msg_and_die("script failed, prerm failure");
        }
-       
-       for (pkg = pkgs; pkg != 0; pkg = pkg->next)
-       {
-               dpkg_unpackcontrol(pkg);
-               r = dpkg_dounpack(pkg);
-               if (r != 0) break;
+
+       /* Create a list of files to remove */
+       sprintf(list_name, "/var/lib/dpkg/info/%s.list", package_name);
+       remove_files = create_list(list_name);
+
+       exclude_files = xzalloc(sizeof(char*));
+
+       /* Some directories cant be removed straight away, so do multiple passes */
+       while (remove_file_array(remove_files, exclude_files));
+       free_array(remove_files);
+
+       /* Create a list of all /var/lib/dpkg/info/<package> files */
+       remove_files = all_control_list(package_name);
+       remove_file_array(remove_files, exclude_files);
+       free_array(remove_files);
+       free(exclude_files);
+
+       /* run postrm script */
+       if (run_package_script(package_name, "postrm") == -1) {
+               bb_error_msg_and_die("postrm fialure.. set status to what?");
        }
-       status_merge(status, pkgs);
-       SYSTEM("rm -rf -- " DPKGCIDIR);
-       return r;
+
+       /* Change package status */
+       set_status(status_num, "not-installed", 3);
 }
 
-static int dpkg_configure(package_t *pkgs)
+static archive_handle_t *init_archive_deb_ar(const char *filename)
 {
-       int r = 0;
-       void *found;
-       package_t *pkg;
-       void *status = status_read();
-       for (pkg = pkgs; pkg != 0 && r == 0; pkg = pkg->next)
-       {
-               found = tfind(pkg, &status, package_compare);
-               if (found == 0)
-               {
-                       fprintf(stderr, "Trying to configure %s, but it is not installed\n", pkg->package);
-                       r = 1;
-               }
-               else
-               {
-                       /* configure the package listed in the status file;
-                        * not pkg, as we have info only for the latter */
-                       r = dpkg_doconfigure(*(package_t **)found);
-               }
+       archive_handle_t *ar_handle;
+
+       /* 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);
+}
+
+static void init_archive_deb_control(archive_handle_t *ar_handle)
+{
+       archive_handle_t *tar_handle;
+
+       /* Setup the tar archive handle */
+       tar_handle = init_handle();
+       tar_handle->src_fd = ar_handle->src_fd;
+
+       /* We don't care about data.tar.* or debian-binary, just control.tar.* */
+#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+       llist_add_to(&(ar_handle->accept), "control.tar.gz");
+#endif
+#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+       llist_add_to(&(ar_handle->accept), "control.tar.bz2");
+#endif
+
+       /* Assign the tar handle as a subarchive of the ar handle */
+       ar_handle->sub_archive = tar_handle;
+
+       return;
+}
+
+static void init_archive_deb_data(archive_handle_t *ar_handle)
+{
+       archive_handle_t *tar_handle;
+
+       /* Setup the tar archive handle */
+       tar_handle = init_handle();
+       tar_handle->src_fd = ar_handle->src_fd;
+
+       /* We don't care about control.tar.* or debian-binary, just data.tar.* */
+#ifdef CONFIG_FEATURE_DEB_TAR_GZ
+       llist_add_to(&(ar_handle->accept), "data.tar.gz");
+#endif
+#ifdef CONFIG_FEATURE_DEB_TAR_BZ2
+       llist_add_to(&(ar_handle->accept), "data.tar.bz2");
+#endif
+
+       /* Assign the tar handle as a subarchive of the ar handle */
+       ar_handle->sub_archive = tar_handle;
+
+       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);
+
+       return(ar_handle->sub_archive->buffer);
+}
+
+static void data_extract_all_prefix(archive_handle_t *archive_handle)
+{
+       char *name_ptr = archive_handle->file_header->name;
+
+       name_ptr += strspn(name_ptr, "./");
+       if (name_ptr[0] != '\0') {
+               archive_handle->file_header->name = bb_xasprintf("%s%s", archive_handle->buffer, name_ptr);
+               data_extract_all(archive_handle);
        }
-       status_merge(status, 0);
-       return r;
+       return;
 }
 
-static int dpkg_install(package_t *pkgs)
+static void unpack_package(deb_file_t *deb_file)
 {
-       package_t *p, *ordered = 0;
-       void *status = status_read();
-       if (SYSTEM("rm -rf -- " DPKGCIDIR) != 0 ||
-           mkdir(DPKGCIDIR, S_IRWXU) != 0)
-       {
-               perror("mkdir");
-               return 1;
+       const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
+       const unsigned int status_num = search_status_hashtable(package_name);
+       const unsigned int status_package_num = status_hashtable[status_num]->package;
+       char *info_prefix;
+       archive_handle_t *archive_handle;
+       FILE *out_stream;
+       llist_t *accept_list = NULL;
+       int i = 0;
+
+       /* If existing version, remove it first */
+       if (strcmp(name_hashtable[get_status(status_num, 3)], "installed") == 0) {
+               /* Package is already installed, remove old version first */
+               printf("Preparing to replace %s %s (using %s) ...\n", package_name,
+                       name_hashtable[package_hashtable[status_package_num]->version],
+                       deb_file->filename);
+               remove_package(status_package_num, 0);
+       } else {
+               printf("Unpacking %s (from %s) ...\n", package_name, deb_file->filename);
        }
-       
-       /* Stage 1: parse all the control information */
-       for (p = pkgs; p != 0; p = p->next)
-               if (dpkg_unpackcontrol(p) != 0)
-               {
-                       perror(p->file);
-                       /* force loop break, and prevents further ops */
-                       pkgs = 0;
-               }
-       
-       /* Stage 2: resolve dependencies */
-#ifdef DODEPENDS
-       ordered = depends_resolve(pkgs, status);
-#else
-       ordered = pkgs;
-#endif
-       
-       /* Stage 3: install */
-       for (p = ordered; p != 0; p = p->next)
-       {
-               p->status &= status_wantmask;
-               p->status |= status_wantinstall;
-
-               /* for now the flag is always set to ok... this is probably
-                * not what we want
-                */
-               p->status &= status_flagmask;
-               p->status |= status_flagok;
 
-               if (dpkg_doinstall(p) != 0)
-               {
-                       perror(p->file);
-               }
+       /* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */
+       info_prefix = bb_xasprintf("/var/lib/dpkg/info/%s.", package_name);
+       archive_handle = init_archive_deb_ar(deb_file->filename);
+       init_archive_deb_control(archive_handle);
+
+       while(all_control_files[i]) {
+               char *c = bb_xasprintf("./%s", all_control_files[i]);
+               llist_add_to(&accept_list, c);
+               i++;
        }
-       
-       if (ordered != 0)
-               status_merge(status, pkgs);
-       SYSTEM("rm -rf -- " DPKGCIDIR);
-       return 0;
+       archive_handle->sub_archive->accept = accept_list;
+       archive_handle->sub_archive->filter = filter_accept_list;
+       archive_handle->sub_archive->action_data = data_extract_all_prefix;
+       archive_handle->sub_archive->buffer = info_prefix;
+       archive_handle->sub_archive->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL;
+       unpack_ar_archive(archive_handle);
+
+       /* Run the preinst prior to extracting */
+       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);
+       init_archive_deb_data(archive_handle);
+       archive_handle->sub_archive->action_data = data_extract_all_prefix;
+       archive_handle->sub_archive->buffer = "/";
+       archive_handle->sub_archive->flags |= ARCHIVE_EXTRACT_UNCONDITIONAL;
+       unpack_ar_archive(archive_handle);
+
+       /* Create the list file */
+       strcat(info_prefix, "list");
+       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);
+               fputc('\n', out_stream);
+               archive_handle->sub_archive->passed = archive_handle->sub_archive->passed->link;
+       }
+       fclose(out_stream);
+
+       /* change status */
+       set_status(status_num, "install", 1);
+       set_status(status_num, "unpacked", 3);
+
+       free(info_prefix);
 }
 
-static int dpkg_remove(package_t *pkgs)
+static void configure_package(deb_file_t *deb_file)
 {
-       package_t *p;
-       void *status = status_read();
-       for (p = pkgs; p != 0; p = p->next)
-       {
+       const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
+       const char *package_version = name_hashtable[package_hashtable[deb_file->package]->version];
+       const int status_num = search_status_hashtable(package_name);
+
+       printf("Setting up %s (%s) ...\n", package_name, package_version);
+
+       /* Run the postinst script */
+       if (run_package_script(package_name, "postinst") != 0) {
+               /* TODO: handle failure gracefully */
+               bb_error_msg_and_die("postrm failure.. set status to what?");
        }
-       status_merge(status, 0);
-       return 0;
+       /* Change status to reflect success */
+       set_status(status_num, "install", 1);
+       set_status(status_num, "installed", 3);
 }
 
-extern int dpkg_main(int argc, char **argv)
-{
-       char opt = 0;
-       char *s;
-       package_t *p, *packages = NULL;
-       char *cwd = getcwd(0, 0);
-       while (*++argv)
-       {
-               if (**argv == '-') {
-                       /* Nasty little hack to "parse" long options. */
-                       s = *argv;
-                       while (*s == '-')
-                               s++;
-                       opt=s[0];
-               }
-               else
-               {
-                       p = (package_t *)malloc(sizeof(package_t));
-                       memset(p, 0, sizeof(package_t));
-                       if (**argv == '/')
-                               p->file = *argv;
-                       else if (opt != 'c')
-                       {
-                               p->file = malloc(strlen(cwd) + strlen(*argv) + 2);
-                               sprintf(p->file, "%s/%s", cwd, *argv);
+int dpkg_main(int argc, char **argv)
+{
+       deb_file_t **deb_file = NULL;
+       status_node_t *status_node;
+       int opt;
+       int package_num;
+       int dpkg_opt = 0;
+       int deb_count = 0;
+       int state_status;
+       int status_num;
+       int i;
+
+       while ((opt = getopt(argc, argv, "CF:ilPru")) != -1) {
+               switch (opt) {
+                       case 'C': // equivalent to --configure in official dpkg
+                               dpkg_opt |= dpkg_opt_configure;
+                               dpkg_opt |= dpkg_opt_package_name;
+                               break;
+                       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;
+                               dpkg_opt |= dpkg_opt_filename;
+                               break;
+                       case 'l':
+                               dpkg_opt |= dpkg_opt_list_installed;
+                               break;
+                       case 'P':
+                               dpkg_opt |= dpkg_opt_purge;
+                               dpkg_opt |= dpkg_opt_package_name;
+                               break;
+                       case 'r':
+                               dpkg_opt |= dpkg_opt_remove;
+                               dpkg_opt |= dpkg_opt_package_name;
+                               break;
+                       case 'u':       /* Equivalent to --unpack in official dpkg */
+                               dpkg_opt |= dpkg_opt_unpack;
+                               dpkg_opt |= dpkg_opt_filename;
+                               break;
+                       default:
+                               bb_show_usage();
+               }
+       }
+       /* check for non-otion argument if expected  */
+       if ((dpkg_opt == 0) || ((argc == optind) && !(dpkg_opt && dpkg_opt_list_installed))) {
+               bb_show_usage();
+       }
+
+/*     puts("(Reading database ... xxxxx files and directories installed.)"); */
+       index_status_file("/var/lib/dpkg/status");
+
+       /* if the list action was given print the installed packages and exit */
+       if (dpkg_opt & dpkg_opt_list_installed) {
+               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] */
+               deb_file = xrealloc(deb_file, sizeof(deb_file_t *) * (deb_count + 2));
+               deb_file[deb_count] = (deb_file_t *) xzalloc(sizeof(deb_file_t));
+               if (dpkg_opt & dpkg_opt_filename) {
+                       archive_handle_t *archive_handle;
+                       llist_t *control_list = NULL;
+
+                       /* Extract the control file */
+                       llist_add_to(&control_list, "./control");
+                       archive_handle = init_archive_deb_ar(argv[optind]);
+                       init_archive_deb_control(archive_handle);
+                       deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list);
+                       if (deb_file[deb_count]->control_file == NULL) {
+                               bb_error_msg_and_die("Couldnt extract control file");
+                       }
+                       deb_file[deb_count]->filename = bb_xstrdup(argv[optind]);
+                       package_num = fill_package_struct(deb_file[deb_count]->control_file);
+
+                       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;
+
+                       /* Add the package to the status hashtable */
+                       if ((dpkg_opt & dpkg_opt_unpack) || (dpkg_opt & dpkg_opt_install)) {
+                               /* Try and find a currently installed version of this package */
+                               status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[deb_count]->package]->name]);
+                               /* If no previous entry was found initialise a new entry */
+                               if ((status_hashtable[status_num] == NULL) ||
+                                       (status_hashtable[status_num]->status == 0)) {
+                                       status_node = (status_node_t *) xmalloc(sizeof(status_node_t));
+                                       status_node->package = deb_file[deb_count]->package;
+                                       /* reinstreq isnt changed to "ok" until the package control info
+                                        * is written to the status file*/
+                                       status_node->status = search_name_hashtable("install reinstreq not-installed");
+                                       status_hashtable[status_num] = status_node;
+                               } else {
+                                       set_status(status_num, "install", 1);
+                                       set_status(status_num, "reinstreq", 2);
+                               }
+                       }
+               }
+               else if (dpkg_opt & dpkg_opt_package_name) {
+                       deb_file[deb_count]->package = search_package_hashtable(
+                               search_name_hashtable(argv[optind]),
+                               search_name_hashtable("ANY"), VER_ANY);
+                       if (package_hashtable[deb_file[deb_count]->package] == NULL) {
+                               bb_error_msg_and_die("Package %s is uninstalled or unknown\n", argv[optind]);
                        }
-                       else {
-                               p->package = strdup(*argv);
+                       package_num = deb_file[deb_count]->package;
+                       status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
+                       state_status = get_status(status_num, 3);
+
+                       /* check package status is "installed" */
+                       if (dpkg_opt & dpkg_opt_remove) {
+                               if ((strcmp(name_hashtable[state_status], "not-installed") == 0) ||
+                                       (strcmp(name_hashtable[state_status], "config-files") == 0)) {
+                                       bb_error_msg_and_die("%s is already removed.", name_hashtable[package_hashtable[package_num]->name]);
+                               }
+                               set_status(status_num, "deinstall", 1);
+                       }
+                       else if (dpkg_opt & dpkg_opt_purge) {
+                               /* if package status is "conf-files" then its ok */
+                               if (strcmp(name_hashtable[state_status], "not-installed") == 0) {
+                                       bb_error_msg_and_die("%s is already purged.", name_hashtable[package_hashtable[package_num]->name]);
+                               }
+                               set_status(status_num, "purge", 1);
                        }
-                       p->next = packages;
-                       packages = p;
                }
-                       
+               deb_count++;
+               optind++;
        }
-       switch (opt)
-       {
-               case 'i': return dpkg_install(packages); break;
-               case 'r': return dpkg_remove(packages); break;
-               case 'u': return dpkg_unpack(packages); break;
-               case 'c': return dpkg_configure(packages); break;
+       deb_file[deb_count] = NULL;
+
+       /* Check that the deb file arguments are installable */
+       if ((dpkg_opt & dpkg_opt_force_ignore_depends) != dpkg_opt_force_ignore_depends) {
+               if (!check_deps(deb_file, 0, deb_count)) {
+                       bb_error_msg_and_die("Dependency check failed");
+               }
        }
 
-       /* if it falls through to here, some of the command line options were
-          wrong */
-       usage(dpkg_usage);
-       return 0;
-}
\ No newline at end of file
+       /* TODO: install or remove packages in the correct dependency order */
+       for (i = 0; i < deb_count; i++) {
+               /* Remove or purge packages */
+               if (dpkg_opt & dpkg_opt_remove) {
+                       remove_package(deb_file[i]->package, 1);
+               }
+               else if (dpkg_opt & dpkg_opt_purge) {
+                       purge_package(deb_file[i]->package);
+               }
+               else if (dpkg_opt & dpkg_opt_unpack) {
+                       unpack_package(deb_file[i]);
+               }
+               else if (dpkg_opt & dpkg_opt_install) {
+                       unpack_package(deb_file[i]);
+                       /* package is configured in second pass below */
+               }
+               else if (dpkg_opt & dpkg_opt_configure) {
+                       configure_package(deb_file[i]);
+               }
+       }
+       /* configure installed packages */
+       if (dpkg_opt & dpkg_opt_install) {
+               for (i = 0; i < deb_count; i++)
+                       configure_package(deb_file[i]);
+       }
+
+       write_status_file(deb_file);
+
+       for (i = 0; i < deb_count; i++) {
+               free(deb_file[i]->control_file);
+               free(deb_file[i]->filename);
+               free(deb_file[i]);
+       }
+
+       free(deb_file);
+
+       for (i = 0; i < NAME_HASH_PRIME; i++) {
+               free(name_hashtable[i]);
+       }
+
+       for (i = 0; i < PACKAGE_HASH_PRIME; i++) {
+               if (package_hashtable[i] != NULL) {
+                       free_package(package_hashtable[i]);
+               }
+       }
+
+       for (i = 0; i < STATUS_HASH_PRIME; i++) {
+               free(status_hashtable[i]);
+       }
+
+       return(EXIT_SUCCESS);
+}
+