X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg.c;h=0dff32b3b62d2d1dfa6425c808ab1b8dcf5e1c61;hp=857ed7433ff8347180b11fd2fc85c20c65b81a64;hb=da40af11f7cdf54b484c8aae73d6201694e6c234;hpb=b06a66aaeddc129a3a8c08f0ac45be6d7f2c5199

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 857ed74..0dff32b 100644
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -56,7 +56,7 @@ struct _opkg_t
  * Clone a pkg_t 
  */ 
 static opkg_package_t*
-pkg_clone (pkg_t *old)
+pkg_t_to_opkg_package_t (pkg_t *old)
 {
   opkg_package_t *new;
 
@@ -429,7 +429,7 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call
   new->state_flag |= SF_USER;
 
   pdata.action = OPKG_INSTALL;
-  pdata.package = pkg_clone (new);
+  pdata.package = pkg_t_to_opkg_package_t (new);
 
   progress (pdata, 0);
 
@@ -459,7 +459,7 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call
       continue;
 
     opkg_package_free (pdata.package);
-    pdata.package = pkg_clone (pkg);
+    pdata.package = pkg_t_to_opkg_package_t (pkg);
     pdata.action = OPKG_DOWNLOAD;
 
     if (pkg->src == NULL)
@@ -511,7 +511,7 @@ opkg_install_package (opkg_t *opkg, const char *package_name, opkg_progress_call
 
   /* 75% of "install" progress is for downloading */
   opkg_package_free (pdata.package);
-  pdata.package = pkg_clone (new);
+  pdata.package = pkg_t_to_opkg_package_t (new);
   pdata.action = OPKG_INSTALL;
   progress (pdata, 75);
 
@@ -575,7 +575,7 @@ opkg_remove_package (opkg_t *opkg, const char *package_name, opkg_progress_callb
   }
 
   pdata.action = OPKG_REMOVE;
-  pdata.package = pkg_clone (pkg);
+  pdata.package = pkg_t_to_opkg_package_t (pkg);
   progress (pdata, 0);
 
 
@@ -651,7 +651,7 @@ opkg_upgrade_package (opkg_t *opkg, const char *package_name, opkg_progress_call
   }
 
   pdata.action = OPKG_INSTALL;
-  pdata.package = pkg_clone (pkg);
+  pdata.package = pkg_t_to_opkg_package_t (pkg);
   progress (pdata, 0);
 
   err = opkg_upgrade_pkg (opkg->conf, pkg);
@@ -712,7 +712,7 @@ opkg_upgrade_all (opkg_t *opkg, opkg_progress_callback_t progress_callback, void
   {
     pkg = installed->pkgs[i];
 
-    pdata.package = pkg_clone (pkg);
+    pdata.package = pkg_t_to_opkg_package_t (pkg);
     progress (pdata, 99 * i / installed->len);
     opkg_package_free (pdata.package);
 
@@ -927,7 +927,7 @@ opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_d
 
     pkg = all->pkgs[i];
 
-    package = pkg_clone (pkg);
+    package = pkg_t_to_opkg_package_t (pkg);
     callback (opkg, package, user_data);
     opkg_package_free (package);
   }
@@ -940,8 +940,11 @@ opkg_list_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_d
 int
 opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, void *user_data)
 {
-    pkg_vec_t *all;
-    int i;
+    struct active_list *head;
+    struct active_list *node;
+    pkg_t *old=NULL, *new = NULL;
+    static opkg_package_t* package=NULL;
+
 
     opkg_assert (opkg);
     opkg_assert (callback);
@@ -949,23 +952,15 @@ opkg_list_upgradable_packages (opkg_t *opkg, opkg_package_callback_t callback, v
     /* 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];
-
+    head  =  prepare_upgrade_list(opkg->conf);
+    for (node=active_list_next(head, head); node; active_list_next(head,node)) {
+        old = list_entry(node, pkg_t, list);
         new = pkg_hash_fetch_best_installation_candidate_by_name(opkg->conf, old->name, NULL);
-
-        package = pkg_clone (new);
+        package = pkg_t_to_opkg_package_t (new);
         callback (opkg, package, user_data);
         opkg_package_free (package);
     }
-
-    pkg_vec_free (all);
-
+    active_list_head_delete(head);
     return 0;
 }
 
@@ -1016,7 +1011,7 @@ opkg_find_package (opkg_t *opkg, const char *name, const char *ver, const char *
     }
 
     /* match found */
-    package = pkg_clone (pkg);
+    package = pkg_t_to_opkg_package_t (pkg);
     break;
   }