Running a script does not change the state, modifying the state flags does.
[oweals/opkg-lede.git] / libopkg / opkg_cmd.c
index f67a2645152866689a8f8336995ae1c110b78979..88a0b5f13fb5e8baae7200dbb78b9ce83e6ef478 100644 (file)
@@ -30,7 +30,6 @@
 #include "sprintf_alloc.h"
 #include "pkg.h"
 #include "file_util.h"
-#include "str_util.h"
 #include "libbb/libbb.h"
 #include "opkg_utils.h"
 #include "opkg_defines.h"
 #include "opkg_upgrade.h"
 #include "opkg_remove.h"
 #include "opkg_configure.h"
-#include "opkg_message.h"
-#include "libopkg.h"
 #include "xsystem.h"
 
-static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_info_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_status_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_install_pending_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_remove_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_purge_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_flag_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_depends_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatdepends_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatdepends_recursively_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatsuggests_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatrecommends_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatprovides_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatconflicts_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_whatreplaces_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_compare_versions_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_print_architecture_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int opkg_configure_cmd(opkg_conf_t *conf, int argc, char **argv);
-static int pkg_mark_provides(pkg_t *pkg);
-
-/* XXX: CLEANUP: The usage strings should be incorporated into this
-   array for easier maintenance */
-static opkg_cmd_t cmds[] = {
-     {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd}, 
-     {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd},
-     {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd},
-     {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd},
-     {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd},
-     {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd},
-     {"flag", 1, (opkg_cmd_fun_t)opkg_flag_cmd},
-     {"status", 0, (opkg_cmd_fun_t)opkg_status_cmd},
-     {"install_pending", 0, (opkg_cmd_fun_t)opkg_install_pending_cmd},
-     {"install", 1, (opkg_cmd_fun_t)opkg_install_cmd},
-     {"remove", 1, (opkg_cmd_fun_t)opkg_remove_cmd},
-     {"purge", 1, (opkg_cmd_fun_t)opkg_purge_cmd},
-     {"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd},
-     {"files", 1, (opkg_cmd_fun_t)opkg_files_cmd},
-     {"search", 1, (opkg_cmd_fun_t)opkg_search_cmd},
-     {"download", 1, (opkg_cmd_fun_t)opkg_download_cmd},
-     {"compare_versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd},
-     {"compare-versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd},
-     {"print-architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
-     {"print_architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
-     {"print-installation-architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
-     {"print_installation_architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd},
-     {"depends", 1, (opkg_cmd_fun_t)opkg_depends_cmd},
-     {"whatdepends", 1, (opkg_cmd_fun_t)opkg_whatdepends_cmd},
-     {"whatdependsrec", 1, (opkg_cmd_fun_t)opkg_whatdepends_recursively_cmd},
-     {"whatrecommends", 1, (opkg_cmd_fun_t)opkg_whatrecommends_cmd},
-     {"whatsuggests", 1, (opkg_cmd_fun_t)opkg_whatsuggests_cmd},
-     {"whatprovides", 1, (opkg_cmd_fun_t)opkg_whatprovides_cmd},
-     {"whatreplaces", 1, (opkg_cmd_fun_t)opkg_whatreplaces_cmd},
-     {"whatconflicts", 1, (opkg_cmd_fun_t)opkg_whatconflicts_cmd},
-};
-
-static void print_pkg(pkg_t *pkg)
+static void
+print_pkg(pkg_t *pkg)
 {
        char *version = pkg_version_str_alloc(pkg);
        if (pkg->description)
@@ -117,49 +52,30 @@ static void print_pkg(pkg_t *pkg)
 }
 
 int opkg_state_changed;
-static void write_status_files_if_changed(opkg_conf_t *conf)
+
+static void
+write_status_files_if_changed(void)
 {
      if (opkg_state_changed && !conf->noaction) {
-         opkg_message(conf, OPKG_INFO,
-                      "  writing status file\n");
-         opkg_conf_write_status_files(conf);
-         pkg_write_changed_filelists(conf);
+         opkg_msg(INFO, "Writing status file.\n");
+         opkg_conf_write_status_files();
+         pkg_write_changed_filelists();
      } else { 
-         opkg_message(conf, OPKG_DEBUG, "Nothing to be done\n");
-     }
-}
-
-
-static int num_cmds = sizeof(cmds) / sizeof(opkg_cmd_t);
-
-opkg_cmd_t *opkg_cmd_find(const char *name)
-{
-     int i;
-     opkg_cmd_t *cmd;
-
-     for (i=0; i < num_cmds; i++) {
-         cmd = &cmds[i];
-         if (strcmp(name, cmd->name) == 0) {
-              return cmd;
-         }
+         opkg_msg(DEBUG, "Nothing to be done.\n");
      }
-
-     return NULL;
 }
 
-int opkg_cmd_exec(opkg_cmd_t *cmd, opkg_conf_t *conf, int argc, const char **argv, void *userdata)
+static void
+sigint_handler(int sig)
 {
-       int result;
-
-       result = (cmd->fun)(conf, argc, argv);
-
-       print_error_list();
-       free_error_list();
-
-       return result;
+     signal(sig, SIG_DFL);
+     opkg_msg(NOTICE, "Interrupted. Writing out status database.\n");
+     write_status_files_if_changed();
+     exit(128 + sig);
 }
 
-static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_update_cmd(int argc, char **argv)
 {
      char *tmp;
      int err;
@@ -173,17 +89,13 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
  
     if (! file_is_dir(lists_dir)) {
          if (file_exists(lists_dir)) {
-              opkg_message(conf, OPKG_ERROR,
-                           "%s: ERROR: %s exists, but is not a directory\n",
-                           __FUNCTION__, lists_dir);
+              opkg_msg(ERROR, "%s exists, but is not a directory.\n",
+                           lists_dir);
               free(lists_dir);
               return -1;
          }
          err = file_mkdir_hier(lists_dir, 0755);
          if (err) {
-              opkg_message(conf, OPKG_ERROR,
-                           "%s: ERROR: failed to make directory %s: %s\n",
-                           __FUNCTION__, lists_dir, strerror(errno));
               free(lists_dir);
               return -1;
          }     
@@ -193,7 +105,7 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
 
      sprintf_alloc(&tmp, "%s/update-XXXXXX", conf->tmp_dir);
      if (mkdtemp (tmp) == NULL) {
-        perror ("mkdtemp");
+        opkg_perror(ERROR, "Failed to make temp dir %s", conf->tmp_dir);
         return -1;
      }
 
@@ -215,9 +127,9 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
              FILE *in, *out;
              
              sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
-             err = opkg_download(conf, url, tmp_file_name, NULL, NULL);
+             err = opkg_download(url, tmp_file_name, NULL, NULL);
              if (err == 0) {
-                  opkg_message (conf, OPKG_NOTICE, "Inflating %s\n", url);
+                  opkg_msg(NOTICE, "Inflating %s.\n", url);
                   in = fopen (tmp_file_name, "r");
                   out = fopen (list_file_name, "w");
                   if (in && out)
@@ -232,12 +144,11 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
              }
              free(tmp_file_name);
          } else
-             err = opkg_download(conf, url, list_file_name, NULL, NULL);
+             err = opkg_download(url, list_file_name, NULL, NULL);
          if (err) {
               failures++;
          } else {
-              opkg_message(conf, OPKG_NOTICE,
-                           "Updated list of available packages in %s\n",
+              opkg_msg(NOTICE, "Updated list of available packages in %s.\n",
                            list_file_name);
          }
          free(url);
@@ -257,17 +168,16 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
               /* Put the signature in the right place */
               sprintf_alloc (&tmp_file_name, "%s/%s.sig", lists_dir, src->name);
 
-              err = opkg_download(conf, url, tmp_file_name, NULL, NULL);
+              err = opkg_download(url, tmp_file_name, NULL, NULL);
               if (err) {
                   failures++;
-                  opkg_message (conf, OPKG_NOTICE, "Signature check failed\n");
+                  opkg_msg(NOTICE, "Signature check failed.\n");
               } else {
-                  int err;
-                  err = opkg_verify_file (conf, list_file_name, tmp_file_name);
+                  err = opkg_verify_file (list_file_name, tmp_file_name);
                   if (err == 0)
-                      opkg_message (conf, OPKG_NOTICE, "Signature check passed\n");
+                      opkg_msg(NOTICE, "Signature check passed.\n");
                   else
-                      opkg_message (conf, OPKG_NOTICE, "Signature check failed\n");
+                      opkg_msg(NOTICE, "Signature check failed.\n");
               }
               /* We shouldn't unlink the signature ! */
               // unlink (tmp_file_name);
@@ -295,7 +205,8 @@ struct opkg_intercept
 
 typedef struct opkg_intercept *opkg_intercept_t;
 
-static opkg_intercept_t opkg_prep_intercepts(opkg_conf_t *conf)
+static opkg_intercept_t
+opkg_prep_intercepts(void)
 {
     opkg_intercept_t ctx;
     char *newpath;
@@ -306,7 +217,7 @@ static opkg_intercept_t opkg_prep_intercepts(opkg_conf_t *conf)
     sprintf_alloc(&ctx->statedir, "%s/opkg-intercept-XXXXXX", conf->tmp_dir);
 
     if (mkdtemp(ctx->statedir) == NULL) {
-        fprintf(stderr, "%s: mkdtemp: %s\n", __FUNCTION__, strerror(errno));
+        opkg_perror(ERROR,"Failed to make temp dir %s", ctx->statedir);
        free(ctx->oldpath);
        free(ctx->statedir);
         free(newpath);
@@ -321,9 +232,9 @@ static opkg_intercept_t opkg_prep_intercepts(opkg_conf_t *conf)
     return ctx;
 }
 
-static int opkg_finalize_intercepts(opkg_intercept_t ctx)
+static int
+opkg_finalize_intercepts(opkg_intercept_t ctx)
 {
-    char *cmd;
     DIR *dir;
     int err = 0;
 
@@ -341,18 +252,16 @@ static int opkg_finalize_intercepts(opkg_intercept_t ctx)
            
            sprintf_alloc (&path, "%s/%s", ctx->statedir, de->d_name);
            if (access (path, X_OK) == 0) {
-               xsystem (path);
+               const char *argv[] = {"sh", "-c", path, NULL};
+               xsystem (argv);
            }
            free (path);
        }
         closedir(dir);
     } else
-       perror (ctx->statedir);
+       opkg_perror(ERROR, "Failed to open dir %s", ctx->statedir);
        
-    sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
-    err = xsystem (cmd);
-    free (cmd);
-
+    rm_r(ctx->statedir);
     free (ctx->statedir);
     free (ctx);
 
@@ -367,7 +276,8 @@ static int opkg_finalize_intercepts(opkg_intercept_t ctx)
    used to end recursion and avoid an infinite loop on graph cycles.
    pkg_vec ordered will finally contain the ordered set of packages.
 */
-static int opkg_recurse_pkgs_in_order(opkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *all,
+static int
+opkg_recurse_pkgs_in_order(pkg_t *pkg, pkg_vec_t *all,
                                pkg_vec_t *visited, pkg_vec_t *ordered)
 {
     int j,k,l,m;
@@ -391,8 +301,7 @@ static int opkg_recurse_pkgs_in_order(opkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *
     /* If the  package has already been visited (by this function), skip it */
     for(j = 0; j < visited->len; j++) 
         if ( ! strcmp(visited->pkgs[j]->name, pkg->name)) {
-            opkg_message(conf, OPKG_INFO,
-                         "  pkg: %s already visited\n", pkg->name);
+            opkg_msg(DEBUG, "pkg %s already visited, skipping.\n", pkg->name);
             return 0;
         }
     
@@ -401,8 +310,7 @@ static int opkg_recurse_pkgs_in_order(opkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *
     count = pkg->pre_depends_count + pkg->depends_count + \
         pkg->recommends_count + pkg->suggests_count;
 
-    opkg_message(conf, OPKG_INFO,
-                 "  pkg: %s\n", pkg->name);
+    opkg_msg(DEBUG, "pkg %s.\n", pkg->name);
 
     /* Iterate over all the dependencies of pkg. For each one, find a package 
        that is either installed or unpacked and satisfies this dependency.
@@ -417,8 +325,7 @@ static int opkg_recurse_pkgs_in_order(opkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *
             l = 0;
             if (dependents != NULL)
                 while (l < abpkg->provided_by->len && dependents[l] != NULL) {
-                    opkg_message(conf, OPKG_INFO,
-                                 "  Descending on pkg: %s\n", 
+                    opkg_msg(DEBUG, "Descending on pkg %s.\n", 
                                  dependents [l]->name);
     
                     /* find whether dependent l is installed or unpacked,
@@ -427,7 +334,7 @@ static int opkg_recurse_pkgs_in_order(opkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *
                         dep = all->pkgs[m];
                         if ( dep->state_status != SS_NOT_INSTALLED)
                             if ( ! strcmp(dep->name, dependents[l]->name)) {
-                                opkg_recurse_pkgs_in_order(conf, dep, all, 
+                                opkg_recurse_pkgs_in_order(dep, all, 
                                                            visited, ordered);
                                 /* Stop the outer loop */
                                 l = abpkg->provided_by->len;
@@ -449,7 +356,8 @@ static int opkg_recurse_pkgs_in_order(opkg_conf_t *conf, pkg_t *pkg, pkg_vec_t *
 
 }
 
-static int opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
+static int
+opkg_configure_packages(char *pkg_name)
 {
      pkg_vec_t *all, *ordered, *visited;
      int i;
@@ -457,26 +365,23 @@ static int opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
      opkg_intercept_t ic;
      int r, err = 0;
 
-     opkg_message(conf, OPKG_INFO,
-                 "Configuring unpacked packages\n");
-     fflush( stdout );
+     opkg_msg(INFO, "Configuring unpacked packages.\n");
 
      all = pkg_vec_alloc();
 
-     pkg_hash_fetch_available(&conf->pkg_hash, all);
+     pkg_hash_fetch_available(all);
 
      /* Reorder pkgs in order to be configured according to the Depends: tag
         order */
-     opkg_message(conf, OPKG_INFO,
-                  "Reordering packages before configuring them...\n");
+     opkg_msg(INFO, "Reordering packages before configuring them...\n");
      ordered = pkg_vec_alloc();
      visited = pkg_vec_alloc();
      for(i = 0; i < all->len; i++) {
          pkg = all->pkgs[i];
-         opkg_recurse_pkgs_in_order(conf, pkg, all, visited, ordered);
+         opkg_recurse_pkgs_in_order(pkg, all, visited, ordered);
      }
 
-     ic = opkg_prep_intercepts (conf);
+     ic = opkg_prep_intercepts();
      if (ic == NULL) {
             err = -1;
             goto error;
@@ -489,14 +394,13 @@ static int opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
               continue;
 
          if (pkg->state_status == SS_UNPACKED) {
-              opkg_message(conf, OPKG_NOTICE,
-                           "Configuring %s\n", pkg->name);
-              fflush( stdout );
-              r = opkg_configure(conf, pkg);
+              opkg_msg(NOTICE, "Configuring %s.\n", pkg->name);
+              r = opkg_configure(pkg);
               if (r == 0) {
                    pkg->state_status = SS_INSTALLED;
                    pkg->parent->state_status = SS_INSTALLED;
                    pkg->state_flag &= ~SF_PREFER;
+                   opkg_state_changed++;
               } else {
                    if (!err)
                        err = r;
@@ -516,24 +420,13 @@ error:
      return err;
 }
 
-static opkg_conf_t *global_conf;
-
-static void sigint_handler(int sig)
-{
-     signal(sig, SIG_DFL);
-     opkg_message(NULL, OPKG_NOTICE,
-                 "opkg: interrupted. writing out status database\n");
-     write_status_files_if_changed(global_conf);
-     exit(128 + sig);
-}
-
-static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_install_cmd(int argc, char **argv)
 {
      int i;
      char *arg;
      int err=0;
 
-     global_conf = conf;
      signal(SIGINT, sigint_handler);
 
      /*
@@ -542,118 +435,109 @@ static int opkg_install_cmd(opkg_conf_t *conf, int argc, char **argv)
      for (i=0; i < argc; i++) {
          arg = argv[i];
 
-          opkg_message(conf, OPKG_DEBUG2, "Debug install_cmd: %s  \n",arg );
-          err = opkg_prepare_url_for_install(conf, arg, &argv[i]);
-          if (err != EINVAL && err != 0)
+          opkg_msg(DEBUG2, "%s\n", arg);
+          err = opkg_prepare_url_for_install(arg, &argv[i]);
+          if (err)
               return err;
      }
-     pkg_info_preinstall_check(conf);
+     pkg_info_preinstall_check();
 
      for (i=0; i < argc; i++) {
          arg = argv[i];
-          err = opkg_install_by_name(conf, arg);
-         if (err == OPKG_PKG_HAS_NO_CANDIDATE) {
-              opkg_message(conf, OPKG_ERROR,
-                           "Cannot find package %s.\n",
-                           arg);
+          err = opkg_install_by_name(arg);
+         if (err) {
+              opkg_msg(ERROR, "Cannot install package %s.\n", arg);
          }
      }
 
-     opkg_configure_packages(conf, NULL);
+     opkg_configure_packages(NULL);
 
-     write_status_files_if_changed(conf);
+     write_status_files_if_changed();
 
      return err;
 }
 
-static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_upgrade_cmd(int argc, char **argv)
 {
      int i;
      pkg_t *pkg;
      int err;
 
-     global_conf = conf;
      signal(SIGINT, sigint_handler);
 
      if (argc) {
          for (i=0; i < argc; i++) {
               char *arg = argv[i];
 
-               err = opkg_prepare_url_for_install(conf, arg, &arg);
-               if (err != EINVAL && err != 0)
+               err = opkg_prepare_url_for_install(arg, &arg);
+               if (err)
                    return err;
          }
-         pkg_info_preinstall_check(conf);
+         pkg_info_preinstall_check();
 
          for (i=0; i < argc; i++) {
               char *arg = argv[i];
               if (conf->restrict_to_default_dest) {
-                   pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-                                                               argv[i],
-                                                               conf->default_dest);
+                   pkg = pkg_hash_fetch_installed_by_name_dest(argv[i],
+                                                       conf->default_dest);
                    if (pkg == NULL) {
-                        opkg_message(conf, OPKG_NOTICE,
-                                     "Package %s not installed in %s\n",
+                        opkg_msg(NOTICE, "Package %s not installed in %s.\n",
                                      argv[i], conf->default_dest->name);
                         continue;
                    }
               } else {
-                   pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash,
-                                                          argv[i]);
+                   pkg = pkg_hash_fetch_installed_by_name(argv[i]);
               }
               if (pkg)
-                   opkg_upgrade_pkg(conf, pkg);
+                   opkg_upgrade_pkg(pkg);
               else {
-                   opkg_install_by_name(conf, arg);
+                   opkg_install_by_name(arg);
                }
          }
      } else {
          pkg_vec_t *installed = pkg_vec_alloc();
 
-         pkg_info_preinstall_check(conf);
+         pkg_info_preinstall_check();
 
-         pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
+         pkg_hash_fetch_all_installed(installed);
          for (i = 0; i < installed->len; i++) {
               pkg = installed->pkgs[i];
-              opkg_upgrade_pkg(conf, pkg);
+              opkg_upgrade_pkg(pkg);
          }
          pkg_vec_free(installed);
      }
 
-     opkg_configure_packages(conf, NULL);
+     opkg_configure_packages(NULL);
 
-     write_status_files_if_changed(conf);
+     write_status_files_if_changed();
 
      return 0;
 }
 
-static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_download_cmd(int argc, char **argv)
 {
      int i, err;
      char *arg;
      pkg_t *pkg;
 
-     pkg_info_preinstall_check(conf);
+     pkg_info_preinstall_check();
      for (i = 0; i < argc; i++) {
          arg = argv[i];
 
-         pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, arg, &err);
+         pkg = pkg_hash_fetch_best_installation_candidate_by_name(arg);
          if (pkg == NULL) {
-              opkg_message(conf, OPKG_ERROR,
-                           "Cannot find package %s.\n"
-                           "Check the spelling or perhaps run 'opkg update'\n",
-                           arg);
+              opkg_msg(ERROR, "Cannot find package %s.\n", arg);
               continue;
          }
 
-         err = opkg_download_pkg(conf, pkg, ".");
+         err = opkg_download_pkg(pkg, ".");
 
          if (err) {
-              opkg_message(conf, OPKG_ERROR,
-                           "Failed to download %s\n", pkg->name);
+              opkg_msg(ERROR, "Failed to download %s.\n", pkg->name);
          } else {
-              opkg_message(conf, OPKG_NOTICE,
-                           "Downloaded %s as %s\n",
+              opkg_msg(NOTICE, "Downloaded %s as %s.\n",
                            pkg->name, pkg->local_filename);
          }
      }
@@ -662,7 +546,8 @@ static int opkg_download_cmd(opkg_conf_t *conf, int argc, char **argv)
 }
 
 
-static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_list_cmd(int argc, char **argv)
 {
      int i;
      pkg_vec_t *available;
@@ -673,7 +558,7 @@ static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv)
          pkg_name = argv[0];
      }
      available = pkg_vec_alloc();
-     pkg_hash_fetch_available(&conf->pkg_hash, available);
+     pkg_hash_fetch_available(available);
      pkg_vec_sort(available, pkg_compare_names);
      for (i=0; i < available->len; i++) {
          pkg = available->pkgs[i];
@@ -688,7 +573,8 @@ static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv)
 }
 
 
-static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_list_installed_cmd(int argc, char **argv)
 {
      int i ;
      pkg_vec_t *available;
@@ -699,7 +585,7 @@ static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv)
          pkg_name = argv[0];
      }
      available = pkg_vec_alloc();
-     pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
+     pkg_hash_fetch_all_installed(available);
      pkg_vec_sort(available, pkg_compare_names);
      for (i=0; i < available->len; i++) {
          pkg = available->pkgs[i];
@@ -714,15 +600,18 @@ static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv)
      return 0;
 }
 
-static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv) 
+static int
+opkg_list_upgradable_cmd(int argc, char **argv)
 {
-    struct active_list *head = prepare_upgrade_list(conf);
+    struct active_list *head = prepare_upgrade_list();
     struct active_list *node=NULL;
     pkg_t *_old_pkg, *_new_pkg;
     char *old_v, *new_v;
     for (node = active_list_next(head, head); node;node = active_list_next(head,node)) {
         _old_pkg = list_entry(node, pkg_t, list);
-        _new_pkg = pkg_hash_fetch_best_installation_candidate_by_name(conf, _old_pkg->name, NULL);
+        _new_pkg = pkg_hash_fetch_best_installation_candidate_by_name(_old_pkg->name);
+       if (_new_pkg == NULL)
+               continue;
         old_v = pkg_version_str_alloc(_old_pkg);
         new_v = pkg_version_str_alloc(_new_pkg);
         printf("%s - %s - %s\n", _old_pkg->name, old_v, new_v);
@@ -733,7 +622,8 @@ static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv)
     return 0;
 }
 
-static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int installed_only)
+static int
+opkg_info_status_cmd(int argc, char **argv, int installed_only)
 {
      int i;
      pkg_vec_t *available;
@@ -746,9 +636,9 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
 
      available = pkg_vec_alloc();
      if (installed_only)
-         pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
+         pkg_hash_fetch_all_installed(available);
      else
-         pkg_hash_fetch_available(&conf->pkg_hash, available);
+         pkg_hash_fetch_available(available);
 
      for (i=0; i < available->len; i++) {
          pkg = available->pkgs[i];
@@ -758,14 +648,13 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
 
          pkg_formatted_info(stdout, pkg);
 
-         if (conf->verbosity > 1) {
+         if (conf->verbosity >= NOTICE) {
               conffile_list_elt_t *iter;
               for (iter = nv_pair_list_first(&pkg->conffiles); iter; iter = nv_pair_list_next(&pkg->conffiles, iter)) {
                    conffile_t *cf = (conffile_t *)iter->data;
-                   int modified = conffile_has_been_modified(conf, cf);
+                   int modified = conffile_has_been_modified(cf);
                    if (cf->value)
-                       opkg_message(conf, OPKG_NOTICE,
-                               "conffile=%s md5sum=%s modified=%d\n",
+                       opkg_msg(INFO, "conffile=%s md5sum=%s modified=%d.\n",
                                 cf->name, cf->value, modified);
               }
          }
@@ -775,245 +664,132 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
      return 0;
 }
 
-static int opkg_info_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_info_cmd(int argc, char **argv)
 {
-     return opkg_info_status_cmd(conf, argc, argv, 0);
+     return opkg_info_status_cmd(argc, argv, 0);
 }
 
-static int opkg_status_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_status_cmd(int argc, char **argv)
 {
-     return opkg_info_status_cmd(conf, argc, argv, 1);
+     return opkg_info_status_cmd(argc, argv, 1);
 }
 
-static int opkg_configure_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_configure_cmd(int argc, char **argv)
 {
-     
-     int err;
-     if (argc > 0) {
-         char *pkg_name = NULL;
+       int err;
+       char *pkg_name = NULL;
 
-         pkg_name = argv[0];
+       if (argc > 0)
+               pkg_name = argv[0];
 
-         err = opkg_configure_packages (conf, pkg_name);
-     
-     } else {
-         err = opkg_configure_packages (conf, NULL);
-     }
+       err = opkg_configure_packages(pkg_name);
 
-     write_status_files_if_changed(conf);
+       write_status_files_if_changed();
 
-     return err;
+       return err;
 }
 
-static int opkg_install_pending_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_remove_cmd(int argc, char **argv)
 {
-     int i, err;
-     char *globpattern;
-     glob_t globbuf;
-    
-     sprintf_alloc(&globpattern, "%s/*" OPKG_PKG_EXTENSION, conf->pending_dir);
-     err = glob(globpattern, 0, NULL, &globbuf);
-     free(globpattern);
-     if (err) {
-         return 0;
-     }
-
-     opkg_message(conf, OPKG_NOTICE,
-                 "The following packages in %s will now be installed.\n",
-                 conf->pending_dir);
-     for (i = 0; i < globbuf.gl_pathc; i++) {
-         opkg_message(conf, OPKG_NOTICE,
-                      "%s%s", i == 0 ? "" : " ", globbuf.gl_pathv[i]);
-     }
-     opkg_message(conf, OPKG_NOTICE, "\n");
-     for (i = 0; i < globbuf.gl_pathc; i++) {
-         err = opkg_install_from_file(conf, globbuf.gl_pathv[i]);
-         if (err == 0) {
-              err = unlink(globbuf.gl_pathv[i]);
-              if (err) {
-                   opkg_message(conf, OPKG_ERROR,
-                                "%s: ERROR: failed to unlink %s: %s\n",
-                                __FUNCTION__, globbuf.gl_pathv[i], strerror(err));
-                   return err;
-              }
-         }
-     }
-     globfree(&globbuf);
-
-     return err;
-}
-
-static int opkg_remove_cmd(opkg_conf_t *conf, int argc, char **argv)
-{
-     int i,a,done;
+     int i, a, done;
      pkg_t *pkg;
      pkg_t *pkg_to_remove;
      pkg_vec_t *available;
-     char *pkg_name = NULL;
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
 
-// ENH: Add the "no pkg removed" just in case.
-
-    done = 0;
-
-     pkg_info_preinstall_check(conf);
-     if ( argc > 0 ) {
-        available = pkg_vec_alloc();
-        pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
-        for (i=0; i < argc; i++) {
-           pkg_name = xcalloc(1, strlen(argv[i])+2);
-           strcpy(pkg_name,argv[i]);
-           for (a=0; a < available->len; a++) {
-               pkg = available->pkgs[a];
-              if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) {
-                  continue;
-               }
-               if (conf->restrict_to_default_dest) {
-                   pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-                                                               pkg->name,
-                                                               conf->default_dest);
-               } else {
-                   pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
-               }
-        
-               if (pkg_to_remove == NULL) {
-                   opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
-                   continue;
-               }
-               if (pkg->state_status == SS_NOT_INSTALLED) {    // Added the control, so every already removed package could be skipped
-                   opkg_message(conf, OPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
-                    continue;
-               }
-               opkg_remove_pkg(conf, pkg_to_remove,0);
-               done = 1;
-           }
-           free (pkg_name);
-        }
-        pkg_vec_free(available);
-     } else {
-         pkg_vec_t *installed_pkgs = pkg_vec_alloc();
-         int i;
-         int flagged_pkg_count = 0;
-         int removed;
+     done = 0;
 
-         pkg_hash_fetch_all_installed(&conf->pkg_hash, installed_pkgs);
+     signal(SIGINT, sigint_handler);
 
-         for (i = 0; i < installed_pkgs->len; i++) {
-              pkg_t *pkg = installed_pkgs->pkgs[i];
-              if (pkg->state_flag & SF_USER) {
-                   flagged_pkg_count++;
-              } else {
-                   if (!pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL))
-                        opkg_message(conf, OPKG_NOTICE, "Non-user leaf package: %s\n", pkg->name);
-              }
-         }
-         if (!flagged_pkg_count) {
-              opkg_message(conf, OPKG_NOTICE, "No packages flagged as installed by user, \n"
-                           "so refusing to uninstall unflagged non-leaf packages\n");
-              return 0;
-         }
+     pkg_info_preinstall_check();
 
-         /* find packages not flagged SF_USER (i.e., installed to
-          * satisfy a dependence) and not having any dependents, and
-          * remove them */
-         do {
-              removed = 0;
-              for (i = 0; i < installed_pkgs->len; i++) {
-                   pkg_t *pkg = installed_pkgs->pkgs[i];
-                   if (!(pkg->state_flag & SF_USER)
-                       && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) {
-                        removed++;
-                        opkg_message(conf, OPKG_NOTICE, "Removing non-user leaf package %s\n");
-                        opkg_remove_pkg(conf, pkg,0);
-                         done = 1;
-                   }
-              }
-         } while (removed);
-         pkg_vec_free(installed_pkgs);
+     available = pkg_vec_alloc();
+     pkg_hash_fetch_all_installed(available);
+
+     for (i=0; i<argc; i++) {
+        for (a=0; a<available->len; a++) {
+            pkg = available->pkgs[a];
+           if (fnmatch(argv[i], pkg->name, 0)) {
+               continue;
+            }
+            if (conf->restrict_to_default_dest) {
+                pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(
+                                       pkg->name,
+                                       conf->default_dest);
+            } else {
+                pkg_to_remove = pkg_hash_fetch_installed_by_name(pkg->name);
+            }
+        
+            if (pkg_to_remove == NULL) {
+                opkg_msg(ERROR, "Package %s is not installed.\n", pkg->name);
+                continue;
+            }
+            if (pkg->state_status == SS_NOT_INSTALLED) {    // Added the control, so every already removed package could be skipped
+                opkg_msg(ERROR, "Package %s not installed.\n", pkg->name);
+                 continue;
+            }
+            opkg_remove_pkg(pkg_to_remove, 0);
+            done = 1;
+        }
      }
 
-     if ( done == 0 ) 
-        opkg_message(conf, OPKG_NOTICE, "No packages removed.\n");
-
-     write_status_files_if_changed(conf);
-     return 0;
-}
-
-static int opkg_purge_cmd(opkg_conf_t *conf, int argc, char **argv)
-{
-     int i;
-     pkg_t *pkg;
-
-     global_conf = conf;
-     signal(SIGINT, sigint_handler);
-
-     pkg_info_preinstall_check(conf);
-
-     for (i=0; i < argc; i++) {
-         if (conf->restrict_to_default_dest) {
-              pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-                                                          argv[i],
-                                                          conf->default_dest);
-         } else {
-              pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]);
-         }
+     pkg_vec_free(available);
 
-         if (pkg == NULL) {
-              opkg_message(conf, OPKG_ERROR,
-                           "Package %s is not installed.\n", argv[i]);
-              continue;
-         }
-         opkg_purge_pkg(conf, pkg);
-     }
+     if (done == 0)
+        opkg_msg(NOTICE, "No packages removed.\n");
 
-     write_status_files_if_changed(conf);
+     write_status_files_if_changed();
      return 0;
 }
 
-static int opkg_flag_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_flag_cmd(int argc, char **argv)
 {
      int i;
      pkg_t *pkg;
      const char *flags = argv[0];
     
-     global_conf = conf;
      signal(SIGINT, sigint_handler);
 
      for (i=1; i < argc; i++) {
          if (conf->restrict_to_default_dest) {
-              pkg = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
-                                                          argv[i],
+              pkg = pkg_hash_fetch_installed_by_name_dest(argv[i],
                                                           conf->default_dest);
          } else {
-              pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, argv[i]);
+              pkg = pkg_hash_fetch_installed_by_name(argv[i]);
          }
 
          if (pkg == NULL) {
-              opkg_message(conf, OPKG_ERROR,
-                           "Package %s is not installed.\n", argv[i]);
+              opkg_msg(ERROR, "Package %s is not installed.\n", argv[i]);
               continue;
          }
           if (( strcmp(flags,"hold")==0)||( strcmp(flags,"noprune")==0)||
               ( strcmp(flags,"user")==0)||( strcmp(flags,"ok")==0)) {
              pkg->state_flag = pkg_state_flag_from_str(flags);
           }
-/* pb_ asked this feature 03292004 */
-/* Actually I will use only this two, but this is an open for various status */
+
+         /* 
+          * Useful if a package is installed in an offline_root, and
+          * should be configured by opkg-cl configure at a later date.
+          */
           if (( strcmp(flags,"installed")==0)||( strcmp(flags,"unpacked")==0)){
              pkg->state_status = pkg_state_status_from_str(flags);
           }
+
          opkg_state_changed++;
-         opkg_message(conf, OPKG_NOTICE,
-                      "Setting flags for package %s to %s\n",
+         opkg_msg(NOTICE, "Setting flags for package %s to %s.\n",
                       pkg->name, flags);
      }
 
-     write_status_files_if_changed(conf);
+     write_status_files_if_changed();
      return 0;
 }
 
-static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_files_cmd(int argc, char **argv)
 {
      pkg_t *pkg;
      str_list_t *files;
@@ -1021,14 +797,12 @@ static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv)
      char *pkg_version;
 
      if (argc < 1) {
-         return EINVAL;
+         return -1;
      }
 
-     pkg = pkg_hash_fetch_installed_by_name(&conf->pkg_hash,
-                                           argv[0]);
+     pkg = pkg_hash_fetch_installed_by_name(argv[0]);
      if (pkg == NULL) {
-         opkg_message(conf, OPKG_ERROR,
-                      "Package %s not installed.\n", argv[0]);
+         opkg_msg(ERROR, "Package %s not installed.\n", argv[0]);
          return 0;
      }
 
@@ -1047,63 +821,65 @@ static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv)
      return 0;
 }
 
-static int opkg_depends_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_depends_cmd(int argc, char **argv)
 {
+       int i, j, k;
+       int depends_count;
+       pkg_vec_t *available_pkgs;
+       compound_depend_t *cdep;
+       pkg_t *pkg;
+       char *str;
+
+       pkg_info_preinstall_check();
+
+       available_pkgs = pkg_vec_alloc();
+       if (conf->query_all)
+              pkg_hash_fetch_available(available_pkgs);
+       else
+              pkg_hash_fetch_all_installed(available_pkgs);
 
-     if (argc > 0) {
-         pkg_vec_t *available_pkgs = pkg_vec_alloc();
-         const char *rel_str = "depends on";
-         int i;
-     
-         pkg_info_preinstall_check(conf);
+       for (i=0; i<argc; i++) {
+               for (j=0; j<available_pkgs->len; j++) {
+                       pkg = available_pkgs->pkgs[j];
 
-         if (conf->query_all)
-              pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs);
-         else
-              pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs);
-         for (i = 0; i < argc; i++) {
-              const char *target = argv[i];
-              int j;
+                       if (fnmatch(argv[i], pkg->name, 0) != 0)
+                               continue;
 
-              opkg_message(conf, OPKG_ERROR, "target=%s\n", target);
+                       depends_count = pkg->depends_count +
+                                       pkg->pre_depends_count +
+                                       pkg->recommends_count +
+                                       pkg->suggests_count;
+
+                       opkg_msg(NOTICE, "%s depends on:\n", pkg->name);
+
+                       for (k=0; k<depends_count; k++) {
+                               cdep = &pkg->depends[k];
+
+                               if (cdep->type != DEPEND)
+                                     continue;
+
+                               str = pkg_depend_str(pkg, k);
+                               opkg_msg(NOTICE, "\t%s\n", str);
+                               free(str);
+                       }
 
-              for (j = 0; j < available_pkgs->len; j++) {
-                   pkg_t *pkg = available_pkgs->pkgs[j];
-                   if (fnmatch(target, pkg->name, 0) == 0) {
-                        int k;
-                        int count = pkg->depends_count + pkg->pre_depends_count;
-                        opkg_message(conf, OPKG_ERROR, "What %s (arch=%s) %s\n",
-                                     target, pkg->architecture, rel_str);
-                        for (k = 0; k < count; k++) {
-                             compound_depend_t *cdepend = &pkg->depends[k];
-                             int l;
-                             for (l = 0; l < cdepend->possibility_count; l++) {
-                                  depend_t *possibility = cdepend->possibilities[l];
-                                  opkg_message(conf, OPKG_ERROR, "    %s", possibility->pkg->name);
-                                  if (conf->verbosity > 0) {
-                                       // char *ver = abstract_pkg_version_str_alloc(possibility->pkg); 
-                                       opkg_message(conf, OPKG_NOTICE, " %s", possibility->version);
-                                       if (possibility->version) {
-                                            char *typestr = NULL;
-                                            switch (possibility->constraint) {
-                                            case NONE: typestr = "none"; break;
-                                            case EARLIER: typestr = "<"; break;
-                                            case EARLIER_EQUAL: typestr = "<="; break;
-                                            case EQUAL: typestr = "="; break;
-                                            case LATER_EQUAL: typestr = ">="; break;
-                                            case LATER: typestr = ">"; break;
-                                            }
-                                            opkg_message(conf, OPKG_NOTICE, " (%s %s)", typestr, possibility->version);
-                                       }
-                                       // free(ver);
-                                  }
-                                  opkg_message(conf, OPKG_ERROR, "\n");
-                             }
-                        }
-                   }
               }
-         }
-         pkg_vec_free(available_pkgs);
+       }
+
+       pkg_vec_free(available_pkgs);
+       return 0;
+}
+
+static int
+pkg_mark_provides(pkg_t *pkg)
+{
+     int provides_count = pkg->provides_count;
+     abstract_pkg_t **provides = pkg->provides;
+     int i;
+     pkg->parent->state_flag |= SF_MARKED;
+     for (i = 0; i < provides_count; i++) {
+         provides[i]->state_flag |= SF_MARKED;
      }
      return 0;
 }
@@ -1117,145 +893,149 @@ enum what_field_type {
   WHATSUGGESTS
 };
 
-static int opkg_what_depends_conflicts_cmd(opkg_conf_t *conf, enum what_field_type what_field_type, int recursive, int argc, char **argv)
+static int
+opkg_what_depends_conflicts_cmd(enum depend_type what_field_type, int recursive, int argc, char **argv)
 {
-
-     if (argc > 0) {
-         pkg_vec_t *available_pkgs = pkg_vec_alloc();
-         const char *rel_str = NULL;
-         int i;
-         int changed;
-
-         switch (what_field_type) {
-         case WHATDEPENDS: rel_str = "depends on"; break;
-         case WHATCONFLICTS: rel_str = "conflicts with"; break;
-         case WHATSUGGESTS: rel_str = "suggests"; break;
-         case WHATRECOMMENDS: rel_str = "recommends"; break;
-         case WHATPROVIDES: rel_str = "provides"; break;
-         case WHATREPLACES: rel_str = "replaces"; break;
-         }
+       depend_t *possibility;
+       compound_depend_t *cdep;
+       pkg_vec_t *available_pkgs;
+       pkg_t *pkg;
+       int i, j, k, l;
+       int changed, count;
+       const char *rel_str = NULL;
+       char *ver;
+
+       switch (what_field_type) {
+       case DEPEND: rel_str = "depends on"; break;
+       case CONFLICTS: rel_str = "conflicts with"; break;
+       case SUGGEST: rel_str = "suggests"; break;
+       case RECOMMEND: rel_str = "recommends"; break;
+       default: return -1;
+       }
      
-         if (conf->query_all)
-              pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs);
-         else
-              pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs);
+       available_pkgs = pkg_vec_alloc();
 
-         /* mark the root set */
-         pkg_vec_clear_marks(available_pkgs);
-         opkg_message(conf, OPKG_NOTICE, "Root set:\n");
-         for (i = 0; i < argc; i++) {
-              const char *dependee_pattern = argv[i];
-              pkg_vec_mark_if_matches(available_pkgs, dependee_pattern);
-         }
-         for (i = 0; i < available_pkgs->len; i++) {
-              pkg_t *pkg = available_pkgs->pkgs[i];
+       if (conf->query_all)
+              pkg_hash_fetch_available(available_pkgs);
+       else
+              pkg_hash_fetch_all_installed(available_pkgs);
+
+       /* mark the root set */
+       pkg_vec_clear_marks(available_pkgs);
+       opkg_msg(NOTICE, "Root set:\n");
+       for (i = 0; i < argc; i++)
+              pkg_vec_mark_if_matches(available_pkgs, argv[i]);
+
+       for (i = 0; i < available_pkgs->len; i++) {
+              pkg = available_pkgs->pkgs[i];
               if (pkg->state_flag & SF_MARKED) {
                    /* mark the parent (abstract) package */
                    pkg_mark_provides(pkg);
-                   opkg_message(conf, OPKG_NOTICE, "  %s\n", pkg->name);
+                   opkg_msg(NOTICE, "  %s\n", pkg->name);
               }
-         }
+       }
 
-         opkg_message(conf, OPKG_NOTICE, "What %s root set\n", rel_str);
-         do {
-              int j;
-              changed = 0;
+       opkg_msg(NOTICE, "What %s root set\n", rel_str);
+       do {
+               changed = 0;
 
-              for (j = 0; j < available_pkgs->len; j++) {
-                   pkg_t *pkg = available_pkgs->pkgs[j];
-                   int k;
-                   int count = ((what_field_type == WHATCONFLICTS)
+               for (j=0; j<available_pkgs->len; j++) {
+
+                       pkg = available_pkgs->pkgs[j];
+                       count = ((what_field_type == CONFLICTS)
                                 ? pkg->conflicts_count
-                                : pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count);
-                   /* skip this package if it is already marked */
-                   if (pkg->parent->state_flag & SF_MARKED) {
-                        continue;
-                   }
-                   for (k = 0; k < count; k++) {
-                        compound_depend_t *cdepend = 
-                             (what_field_type == WHATCONFLICTS) ? &pkg->conflicts[k] : &pkg->depends[k];
-                        int l;
-                        for (l = 0; l < cdepend->possibility_count; l++) {
-                             depend_t *possibility = cdepend->possibilities[l];
-                             if (possibility->pkg->state_flag & SF_MARKED) {
-                                  /* mark the depending package so we won't visit it again */
-                                  pkg->state_flag |= SF_MARKED;
-                                  pkg_mark_provides(pkg);
-                                  changed++;
-
-                                  opkg_message(conf, OPKG_NOTICE, "    %s", pkg->name);
-                                  if (conf->verbosity > 0) {
-                                       char *ver = pkg_version_str_alloc(pkg); 
-                                       opkg_message(conf, OPKG_NOTICE, " %s", ver);
-                                       opkg_message(conf, OPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name);
+                                : pkg->pre_depends_count +
+                                pkg->depends_count +
+                                pkg->recommends_count +
+                                pkg->suggests_count);
+
+                       /* skip this package if it is already marked */
+                       if (pkg->parent->state_flag & SF_MARKED)
+                               continue;
+
+                       for (k=0; k<count; k++) {
+                               cdep = (what_field_type == CONFLICTS)
+                                       ? &pkg->conflicts[k]
+                                       : &pkg->depends[k];
+
+                               if (what_field_type != cdep->type)
+                                       continue;
+
+                               for (l=0; l<cdep->possibility_count; l++) {
+                                       possibility = cdep->possibilities[l];
+
+                                       if ((possibility->pkg->state_flag
+                                                               & SF_MARKED)
+                                                       != SF_MARKED)
+                                               continue;
+                                       
+                                       /* mark the depending package so we
+                                       * won't visit it again */
+                                       pkg->state_flag |= SF_MARKED;
+                                       pkg_mark_provides(pkg);
+                                       changed++;
+
+                                       ver = pkg_version_str_alloc(pkg); 
+                                       opkg_msg(NOTICE, "\t%s %s\t%s %s",
+                                                       pkg->name,
+                                                       ver,
+                                                       rel_str,
+                                                       possibility->pkg->name);
+                                       free(ver);
                                        if (possibility->version) {
-                                            char *typestr = NULL;
-                                            switch (possibility->constraint) {
-                                            case NONE: typestr = "none"; break;
-                                            case EARLIER: typestr = "<"; break;
-                                            case EARLIER_EQUAL: typestr = "<="; break;
-                                            case EQUAL: typestr = "="; break;
-                                            case LATER_EQUAL: typestr = ">="; break;
-                                            case LATER: typestr = ">"; break;
-                                            }
-                                            opkg_message(conf, OPKG_NOTICE, " (%s %s)", typestr, possibility->version);
+                                               opkg_msg(NOTICE, " (%s%s)",
+                                                       constraint_to_str(possibility->constraint),
+                                                       possibility->version);
                                        }
-                                       free(ver);
-                                       if (!pkg_dependence_satisfiable(conf, possibility))
-                                            opkg_message(conf, OPKG_NOTICE, " unsatisfiable");
-                                  }
-                                  opkg_message(conf, OPKG_NOTICE, "\n");
-                                  goto next_package;
-                             }
-                        }
-                   }
-              next_package:
-                   ;
-              }
-         } while (changed && recursive);
-         pkg_vec_free(available_pkgs);
-     }
-
-     return 0;
+                                       if (!pkg_dependence_satisfiable(possibility))
+                                               opkg_msg(NOTICE,
+                                                       " unsatisfiable");
+                                       opkg_msg(NOTICE, "\n");
+                                       goto next_package;
+                               }
+                       }
+next_package:
+                       ;
+               }
+       } while (changed && recursive);
+
+       pkg_vec_free(available_pkgs);
+
+       return 0;
 }
 
-static int pkg_mark_provides(pkg_t *pkg)
+static int
+opkg_whatdepends_recursively_cmd(int argc, char **argv)
 {
-     int provides_count = pkg->provides_count;
-     abstract_pkg_t **provides = pkg->provides;
-     int i;
-     pkg->parent->state_flag |= SF_MARKED;
-     for (i = 0; i < provides_count; i++) {
-         provides[i]->state_flag |= SF_MARKED;
-     }
-     return 0;
+     return opkg_what_depends_conflicts_cmd(DEPEND, 1, argc, argv);
 }
 
-static int opkg_whatdepends_recursively_cmd(opkg_conf_t *conf, int argc, char **argv)
-{
-     return opkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 1, argc, argv);
-}
-static int opkg_whatdepends_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_whatdepends_cmd(int argc, char **argv)
 {
-     return opkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 0, argc, argv);
+     return opkg_what_depends_conflicts_cmd(DEPEND, 0, argc, argv);
 }
 
-static int opkg_whatsuggests_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_whatsuggests_cmd(int argc, char **argv)
 {
-     return opkg_what_depends_conflicts_cmd(conf, WHATSUGGESTS, 0, argc, argv);
+     return opkg_what_depends_conflicts_cmd(SUGGEST, 0, argc, argv);
 }
 
-static int opkg_whatrecommends_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_whatrecommends_cmd(int argc, char **argv)
 {
-     return opkg_what_depends_conflicts_cmd(conf, WHATRECOMMENDS, 0, argc, argv);
+     return opkg_what_depends_conflicts_cmd(RECOMMEND, 0, argc, argv);
 }
 
-static int opkg_whatconflicts_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_whatconflicts_cmd(int argc, char **argv)
 {
-     return opkg_what_depends_conflicts_cmd(conf, WHATCONFLICTS, 0, argc, argv);
+     return opkg_what_depends_conflicts_cmd(CONFLICTS, 0, argc, argv);
 }
 
-static int opkg_what_provides_replaces_cmd(opkg_conf_t *conf, enum what_field_type what_field_type, int argc, char **argv)
+static int
+opkg_what_provides_replaces_cmd(enum what_field_type what_field_type, int argc, char **argv)
 {
 
      if (argc > 0) {
@@ -1263,17 +1043,17 @@ static int opkg_what_provides_replaces_cmd(opkg_conf_t *conf, enum what_field_ty
          const char *rel_str = (what_field_type == WHATPROVIDES ? "provides" : "replaces");
          int i;
      
-         pkg_info_preinstall_check(conf);
+         pkg_info_preinstall_check();
 
          if (conf->query_all)
-              pkg_hash_fetch_available(&conf->pkg_hash, available_pkgs);
+              pkg_hash_fetch_available(available_pkgs);
          else
-              pkg_hash_fetch_all_installed(&conf->pkg_hash, available_pkgs);
+              pkg_hash_fetch_all_installed(available_pkgs);
          for (i = 0; i < argc; i++) {
               const char *target = argv[i];
               int j;
 
-              opkg_message(conf, OPKG_ERROR, "What %s %s\n",
+              opkg_msg(NOTICE, "What %s %s\n",
                            rel_str, target);
               for (j = 0; j < available_pkgs->len; j++) {
                    pkg_t *pkg = available_pkgs->pkgs[j];
@@ -1285,10 +1065,11 @@ static int opkg_what_provides_replaces_cmd(opkg_conf_t *conf, enum what_field_ty
                               ? pkg->provides[k]
                               : pkg->replaces[k]);
                         if (fnmatch(target, apkg->name, 0) == 0) {
-                             opkg_message(conf, OPKG_ERROR, "    %s", pkg->name);
+                             opkg_msg(NOTICE, "    %s", pkg->name);
                              if (strcmp(target, apkg->name) != 0)
-                                  opkg_message(conf, OPKG_ERROR, "\t%s %s\n", rel_str, apkg->name);
-                             opkg_message(conf, OPKG_ERROR, "\n");
+                                  opkg_msg(NOTICE, "\t%s %s\n",
+                                                  rel_str, apkg->name);
+                             opkg_msg(NOTICE, "\n");
                         }
                    }
               }
@@ -1298,17 +1079,20 @@ static int opkg_what_provides_replaces_cmd(opkg_conf_t *conf, enum what_field_ty
      return 0;
 }
 
-static int opkg_whatprovides_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_whatprovides_cmd(int argc, char **argv)
 {
-     return opkg_what_provides_replaces_cmd(conf, WHATPROVIDES, argc, argv);
+     return opkg_what_provides_replaces_cmd(WHATPROVIDES, argc, argv);
 }
 
-static int opkg_whatreplaces_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_whatreplaces_cmd(int argc, char **argv)
 {
-     return opkg_what_provides_replaces_cmd(conf, WHATREPLACES, argc, argv);
+     return opkg_what_provides_replaces_cmd(WHATREPLACES, argc, argv);
 }
 
-static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_search_cmd(int argc, char **argv)
 {
      int i;
 
@@ -1319,11 +1103,11 @@ static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv)
      char *installed_file;
 
      if (argc < 1) {
-         return EINVAL;
+         return -1;
      }
  
      installed = pkg_vec_alloc();
-     pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
+     pkg_hash_fetch_all_installed(installed);
      pkg_vec_sort(installed, pkg_compare_names);
 
      for (i=0; i < installed->len; i++) {
@@ -1345,23 +1129,25 @@ static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv)
      return 0;
 }
 
-static int opkg_compare_versions_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_compare_versions_cmd(int argc, char **argv)
 {
      if (argc == 3) {
          /* this is a bit gross */
          struct pkg p1, p2;
-         parseVersion(&p1, argv[0]); 
-         parseVersion(&p2, argv[2]); 
+         parse_version(&p1, argv[0]); 
+         parse_version(&p2, argv[2]); 
          return pkg_version_satisfied(&p1, &p2, argv[1]);
      } else {
-         opkg_message(conf, OPKG_ERROR,
+         opkg_msg(ERROR,
                       "opkg compare_versions <v1> <op> <v2>\n"
                       "<op> is one of <= >= << >> =\n");
          return -1;
      }
 }
 
-static int opkg_print_architecture_cmd(opkg_conf_t *conf, int argc, char **argv)
+static int
+opkg_print_architecture_cmd(int argc, char **argv)
 {
      nv_pair_list_elt_t *l;
 
@@ -1371,3 +1157,61 @@ static int opkg_print_architecture_cmd(opkg_conf_t *conf, int argc, char **argv)
      }
      return 0;
 }
+
+
+/* XXX: CLEANUP: The usage strings should be incorporated into this
+   array for easier maintenance */
+static opkg_cmd_t cmds[] = {
+     {"update", 0, (opkg_cmd_fun_t)opkg_update_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"upgrade", 0, (opkg_cmd_fun_t)opkg_upgrade_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"list", 0, (opkg_cmd_fun_t)opkg_list_cmd, PFM_SOURCE},
+     {"list_installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
+     {"list-installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd, PFM_SOURCE},
+     {"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE},
+     {"list-upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_cmd, PFM_SOURCE},
+     {"info", 0, (opkg_cmd_fun_t)opkg_info_cmd, 0},
+     {"flag", 1, (opkg_cmd_fun_t)opkg_flag_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"status", 0, (opkg_cmd_fun_t)opkg_status_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"install", 1, (opkg_cmd_fun_t)opkg_install_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"remove", 1, (opkg_cmd_fun_t)opkg_remove_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"configure", 0, (opkg_cmd_fun_t)opkg_configure_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"files", 1, (opkg_cmd_fun_t)opkg_files_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"search", 1, (opkg_cmd_fun_t)opkg_search_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"download", 1, (opkg_cmd_fun_t)opkg_download_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"compare_versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"compare-versions", 1, (opkg_cmd_fun_t)opkg_compare_versions_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"print-architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"print_architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"print-installation-architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"print_installation_architecture", 0, (opkg_cmd_fun_t)opkg_print_architecture_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"depends", 1, (opkg_cmd_fun_t)opkg_depends_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatdepends", 1, (opkg_cmd_fun_t)opkg_whatdepends_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatdependsrec", 1, (opkg_cmd_fun_t)opkg_whatdepends_recursively_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatrecommends", 1, (opkg_cmd_fun_t)opkg_whatrecommends_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatsuggests", 1, (opkg_cmd_fun_t)opkg_whatsuggests_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatprovides", 1, (opkg_cmd_fun_t)opkg_whatprovides_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatreplaces", 1, (opkg_cmd_fun_t)opkg_whatreplaces_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+     {"whatconflicts", 1, (opkg_cmd_fun_t)opkg_whatconflicts_cmd, PFM_DESCRIPTION|PFM_SOURCE},
+};
+
+opkg_cmd_t *
+opkg_cmd_find(const char *name)
+{
+       int i;
+       opkg_cmd_t *cmd;
+       int num_cmds = sizeof(cmds) / sizeof(opkg_cmd_t);
+
+       for (i=0; i < num_cmds; i++) {
+               cmd = &cmds[i];
+               if (strcmp(name, cmd->name) == 0)
+                       return cmd;
+       }
+
+       return NULL;
+}
+
+int
+opkg_cmd_exec(opkg_cmd_t *cmd, int argc, const char **argv)
+{
+       return (cmd->fun)(argc, argv);
+}