Changeset 4849

Timestamp:

12/05/08 04:37:48 (5 years ago)

Author:

tick

Message:

adding list_upgradable

opkg: refactory the upgradable list

Location:

trunk/src/target/opkg/libopkg

Files:

• args.c (modified) (1 diff)
• opkg.c (modified) (1 diff)
• opkg_cmd.c (modified) (3 diffs)
• opkg_upgrade.c (modified) (1 diff)
• opkg_upgrade.h (modified) (1 diff)
• pkg_vec.h (modified) (1 diff)

trunk/src/target/opkg/libopkg/args.c

@@ -268 +268 @@
      printf("\tlist             List available packages and descriptions\n");
      printf("\tlist_installed           List all and only the installed packages and description \n");
+     printf("\tlist_upgradable          List all the installed and upgradable packages\n");
      printf("\tfiles <pkg>              List all files belonging to <pkg>\n");
      printf("\tsearch <file|regexp>             Search for a package providing <file>\n");

trunk/src/target/opkg/libopkg/opkg.c

@@ -930 +930 @@
 opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
 {
-  pkg_vec_t *all;
-  int i;
-
-  opkg_assert (opkg);
-  opkg_assert (callback);
-
-  /* ensure all data is valid */
-  pkg_info_preinstall_check (opkg->conf);
-
-  all = pkg_vec_alloc ();
-  pkg_hash_fetch_available (&opkg->conf->pkg_hash, all);
-  for (i = 0; i < all->len; i++)
-  {
-    pkg_t *old, *new;
-    int cmp;
-    opkg_package_t *package;
-
-    old = all->pkgs[i];
-    
-    if (old->state_status != SS_INSTALLED)
-      continue;
-
-    new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name, NULL);
-    if (new == NULL) {
-      /* XXX: Notice: Assuming locally install package is up to date */
-      continue;
-    }
-          
-    cmp = pkg_compare_versions(old, new);
-
-    if (cmp < 0)
-    {
-      package = old_pkg_to_new (new);
-      callback (opkg, package, user_data);
-      opkg_package_free (package);
-    }
-  }
-
-  pkg_vec_free (all);
-
-  return 0;
+    pkg_vec_t *all;
+    int i;
+
+    opkg_assert (opkg);
+    opkg_assert (callback);
+
+    /* ensure all data is valid */
+    pkg_info_preinstall_check (opkg->conf);
+
+    all = opkg_upgrade_all_list_get (opkg->conf);
+    for (i = 0; i < all->len; i++)
+    {
+        pkg_t *old, *new;
+        opkg_package_t *package;
+
+        old = all->pkgs[i];
+
+        new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name, NULL);
+
+        package = old_pkg_to_new (new);
+        callback (opkg, package, user_data);
+        opkg_package_free (package);
+    }
+
+    pkg_vec_free (all);
+
+    return 0;
 }
 

trunk/src/target/opkg/libopkg/opkg_cmd.c

@@ -56 +56 @@
 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);
@@ -82 +83 @@
      {"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},
@@ -781 +783 @@
 
      return 0;
+}
+
+static int opkg_list_upgradable_cmd(opkg_conf_t *conf, int argc, char **argv) 
+{
+    pkg_vec_t *all = opkg_upgrade_all_list_get(conf);
+    pkg_t *_old_pkg, *_new_pkg;
+    char *old_v, *new_v;
+    int i;
+    for (i=0;i<all->len;i++) {
+        _old_pkg = all->pkgs[i];
+        _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);
+    }
+    pkg_vec_free(all);
+    return 0;
 }
 

trunk/src/target/opkg/libopkg/opkg_upgrade.c

@@ -78 +78 @@
     return opkg_install_pkg(conf, new,1);
 }
+
+
+
+pkg_vec_t *opkg_upgrade_all_list_get(opkg_conf_t *conf) {
+    pkg_vec_t *all, *ans;
+    int i;
+
+    /* ensure all data is valid */
+    pkg_info_preinstall_check (conf);
+
+    all = pkg_vec_alloc ();
+    ans = pkg_vec_alloc ();
+    pkg_hash_fetch_all_installed (&conf->pkg_hash, all);
+    for (i = 0; i < all->len; i++)
+    {
+        pkg_t *old, *new;
+        int cmp;
+
+        old = all->pkgs[i];
+        new = pkg_hash_fetch_best_installation_candidate_by_name(conf, old->name, NULL);
+
+        if (new == NULL)
+            continue;
+
+        cmp = pkg_compare_versions(old, new);
+
+        if ( cmp < 0 )
+            pkg_vec_insert(ans, old);
+    }
+    pkg_vec_free (all);
+    return ans;
+}

trunk/src/target/opkg/libopkg/opkg_upgrade.h

@@ -15 +15 @@
 
 int opkg_upgrade_pkg(opkg_conf_t *conf, pkg_t *old);
+pkg_vec_t *opkg_upgrade_all_list_get(opkg_conf_t *conf);

trunk/src/target/opkg/libopkg/pkg_vec.h

@@ -43 +43 @@
 void marry_two_packages(pkg_t * newpkg, pkg_t * oldpkg);
 
-void pkg_vec_add(pkg_vec_t *vec, pkg_t *pkg);
 /* pkg_vec_insert_merge: might munge pkg.
 *  returns the pkg that is in the pkg graph */