using list_head to handle the list

[project/opkg-lede.git] / libopkg / opkg_cmd.c

diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
index cf1cc5d80bc07f28661ac143365d4c4571129ab4..518493e9034fffbcff7954af5d3387d5805495a4 100644 (file)
--- a/libopkg/opkg_cmd.c
+++ b/libopkg/opkg_cmd.c
@@ -55,6 +55,7 @@ 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);
@@ -81,6 +82,7 @@ static opkg_cmd_t cmds[] = {
      {"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},
@@ -151,7 +153,7 @@ void opkg_print_error_list (opkg_conf_t *conf)
            error_list = error_list->next;
 
      }
-     free_error_list(&error_list);
+     free_error_list();
   }
 
 }
@@ -215,10 +217,10 @@ static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv)
      }
 
 
-     for (iter = conf->pkg_src_list.head; iter; iter = iter->next) {
+     for (iter = void_list_first(&conf->pkg_src_list); iter; iter = void_list_next(&conf->pkg_src_list, iter)) {
          char *url, *list_file_name;
 
-         src = iter->data;
+         src = (pkg_src_t *)iter->data;
 
          if (src->extra_data)  /* debian style? */
              sprintf_alloc(&url, "%s/%s/%s", src->value, src->extra_data, 
@@ -709,6 +711,7 @@ static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv)
      }
      available = pkg_vec_alloc();
      pkg_hash_fetch_available(&conf->pkg_hash, available);
+     pkg_vec_sort(available, pkg_compare_names);
      for (i=0; i < available->len; i++) {
          pkg = available->pkgs[i];
          /* if we have package name or pattern and pkg does not match, then skip it */
@@ -754,6 +757,7 @@ static int opkg_list_installed_cmd(opkg_conf_t *conf, int argc, char **argv)
      }
      available = pkg_vec_alloc();
      pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
+     pkg_vec_sort(available, pkg_compare_names);
      for (i=0; i < available->len; i++) {
          pkg = available->pkgs[i];
          /* if we have package name or pattern and pkg does not match, then skip it */
@@ -782,6 +786,26 @@ 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) 
+{
+    struct active_list *head = prepare_upgrade_list(conf);
+    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);
+        old_v = pkg_version_str_alloc(_old_pkg);
+        new_v = pkg_version_str_alloc(_new_pkg);
+        if (opkg_cb_list)
+            opkg_cb_list(_old_pkg->name, new_v, old_v, _old_pkg->state_status, p_userdata);
+        free(old_v);
+        free(new_v);
+    }
+    active_list_head_delete(head);
+    return 0;
+}
+
 static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int installed_only)
 {
      int i;
@@ -790,7 +814,7 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
      char *pkg_name = NULL;
      char **pkg_fields = NULL;
      int n_fields = 0;
-     char *buff ; // = (char *)malloc(1);
+     char *buff ; 
 
      if (argc > 0) {
          pkg_name = argv[0];
@@ -825,8 +849,8 @@ static int opkg_info_status_cmd(opkg_conf_t *conf, int argc, char **argv, int in
           }
          if (conf->verbosity > 1) {
               conffile_list_elt_t *iter;
-              for (iter = pkg->conffiles.head; iter; iter = iter->next) {
-                   conffile_t *cf = iter->data;
+              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);
                    opkg_message(conf, OPKG_NOTICE, "conffile=%s md5sum=%s modified=%d\n",
                                 cf->name, cf->value, modified);
@@ -1116,7 +1140,7 @@ static int opkg_files_cmd(opkg_conf_t *conf, int argc, char **argv)
               buff = realloc (buff, buff_len);
               goto try_again;
          }
-         for (iter = installed_files->head; iter; iter = iter->next) {
+         for (iter = str_list_first(installed_files); iter; iter = str_list_next(installed_files, iter)) {
               used_len += strlen (iter->data) + 1;
               while (buff_len <= used_len) {
                    buff_len *= 2;
@@ -1416,14 +1440,15 @@ static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv)
  
      installed = pkg_vec_alloc();
      pkg_hash_fetch_all_installed(&conf->pkg_hash, installed);
+     pkg_vec_sort(installed, pkg_compare_names);
 
      for (i=0; i < installed->len; i++) {
          pkg = installed->pkgs[i];
 
          installed_files = pkg_get_installed_files(pkg);
 
-         for (iter = installed_files->head; iter; iter = iter->next) {
-              installed_file = iter->data;
+         for (iter = str_list_first(installed_files); iter; iter = str_list_next(installed_files, iter)) {
+              installed_file = (char *)iter->data;
               if (fnmatch(argv[0], installed_file, 0)==0)  {
                        if (opkg_cb_list) opkg_cb_list(pkg->name, 
                                                       installed_file, 
@@ -1435,9 +1460,6 @@ static int opkg_search_cmd(opkg_conf_t *conf, int argc, char **argv)
          pkg_free_installed_files(pkg);
      }
 
-     /* XXX: CLEANUP: It's not obvious from the name of
-       pkg_hash_fetch_all_installed that we need to call
-       pkg_vec_free to avoid a memory leak. */
      pkg_vec_free(installed);
 
      return 0;
@@ -1469,11 +1491,9 @@ static int opkg_print_architecture_cmd(opkg_conf_t *conf, int argc, char **argv)
 {
      nv_pair_list_elt_t *l;
 
-     l = conf->arch_list.head;
-     while (l) {
-         nv_pair_t *nv = l->data;
+     list_for_each_entry(l, &conf->arch_list.head, node) {
+         nv_pair_t *nv = (nv_pair_t *)l->data;
          printf("arch %s %s\n", nv->name, nv->value);
-         l = l->next;
      }
      return 0;
 }