libopkg: remove "extra_data" option
[project/opkg-lede.git] / libopkg / opkg_cmd.c
index c26e2c384fe27fe7e966f5060e3e94fef5487c6e..83e345e527856ec5eebdcd4fb76284f8154839e3 100644 (file)
@@ -117,16 +117,8 @@ static int opkg_update_cmd(int argc, char **argv)
 
                src = (pkg_src_t *) iter->data;
 
-               if (src->extra_data && strcmp(src->extra_data, "__dummy__ "))
-                       continue;
-
-               if (src->extra_data)    /* debian style? */
-                       sprintf_alloc(&url, "%s/%s/%s", src->value,
-                                     src->extra_data,
-                                     src->gzip ? "Packages.gz" : "Packages");
-               else
-                       sprintf_alloc(&url, "%s/%s", src->value,
-                                     src->gzip ? "Packages.gz" : "Packages");
+               sprintf_alloc(&url, "%s/%s", src->value,
+                             src->gzip ? "Packages.gz" : "Packages");
 
                sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
                pkglist_dl_error = 0;
@@ -146,12 +138,8 @@ static int opkg_update_cmd(int argc, char **argv)
                if (pkglist_dl_error == 0 && conf->check_signature) {
                        /* download detached signitures to verify the package lists */
                        /* get the url for the sig file */
-                       if (src->extra_data)    /* debian style? */
-                               sprintf_alloc(&url, "%s/%s/%s", src->value,
-                                             src->extra_data, "Packages.sig");
-                       else
-                               sprintf_alloc(&url, "%s/%s", src->value,
-                                             "Packages.sig");
+                       sprintf_alloc(&url, "%s/%s", src->value,
+                                     "Packages.sig");
 
                        /* create temporary file for it */
                        char *tmp_file_name;
@@ -458,7 +446,7 @@ static int opkg_install_cmd(int argc, char **argv)
        }
 
        pkg_hash_load_package_details();
-       pkg_hash_load_status_files();
+       pkg_hash_load_status_files(NULL, NULL);
 
        if (conf->force_reinstall) {
                int saved_force_depends = conf->force_depends;
@@ -569,31 +557,108 @@ static int opkg_download_cmd(int argc, char **argv)
        return err;
 }
 
+struct opkg_list_find_cmd_item {
+       int size;
+       char *name;
+       char *version;
+       char *description;
+};
+
+struct opkg_list_find_cmd_args {
+       int use_desc;
+       int set_status;
+       char *pkg_name;
+       struct opkg_list_find_cmd_item **items;
+       size_t n_items;
+};
+
+static void opkg_list_find_cmd_cb(pkg_t *pkg, void *priv)
+{
+       struct opkg_list_find_cmd_args *args = priv;
+       char *description = pkg_get_string(pkg, PKG_DESCRIPTION);
+       char *version = pkg_version_str_alloc(pkg);
+       struct opkg_list_find_cmd_item *item;
+       char *nameptr, *versionptr, *descriptionptr;
+       int i, found = 0;
+
+       /* if we have package name or pattern and pkg does not match, then skip it */
+       if (args->pkg_name && fnmatch(args->pkg_name, pkg->name, conf->nocase) &&
+           (!args->use_desc || !description
+            || fnmatch(args->pkg_name, description, conf->nocase)))
+               goto out;
+
+       if (args->set_status) {
+               for (i = 0; i < args->n_items; i++) {
+                       if (!strcmp(args->items[i]->name, pkg->name)) {
+                               found = 1;
+                               break;
+                       }
+               }
+       }
+
+       if (!found) {
+               item = calloc_a(sizeof(*item),
+                               &nameptr, strlen(pkg->name) + 1,
+                               &versionptr, strlen(version) + 1,
+                               &descriptionptr, description ? strlen(description) + 1 : 0);
+
+               item->name = strcpy(nameptr, pkg->name);
+               item->size = pkg_get_int(pkg, PKG_SIZE);
+               item->version = strcpy(versionptr, version);
+               item->description = description ? strcpy(descriptionptr, description) : NULL;
+
+               args->items = xrealloc(args->items, sizeof(item) * (args->n_items + 1));
+               args->items[args->n_items++] = item;
+       }
+
+out:
+       pkg_deinit(pkg);
+       free(pkg);
+       free(version);
+}
+
+static int opkg_list_find_cmd_sort(const void *a, const void *b)
+{
+       const struct opkg_list_find_cmd_item *pkg_a = *(const struct opkg_list_find_cmd_item **)a;
+       const struct opkg_list_find_cmd_item *pkg_b = *(const struct opkg_list_find_cmd_item **)b;
+       return strcmp(pkg_a->name, pkg_b->name);
+}
+
 static int opkg_list_find_cmd(int argc, char **argv, int use_desc)
 {
        int i;
-       pkg_vec_t *available;
-       pkg_t *pkg;
-       char *pkg_name = NULL;
-       char *description;
+       struct opkg_list_find_cmd_args args = {
+               .use_desc = use_desc,
+               .pkg_name = (argc > 0) ? argv[0] : NULL
+       };
 
-       if (argc > 0) {
-               pkg_name = argv[0];
-       }
-       available = pkg_vec_alloc();
-       pkg_hash_fetch_available(available);
-       pkg_vec_sort(available, pkg_compare_names);
-       for (i = 0; i < available->len; i++) {
-               pkg = available->pkgs[i];
-               description = use_desc ? pkg_get_string(pkg, PKG_DESCRIPTION) : NULL;
-               /* if we have package name or pattern and pkg does not match, then skip it */
-               if (pkg_name && fnmatch(pkg_name, pkg->name, conf->nocase) &&
-                   (!use_desc || !description
-                    || fnmatch(pkg_name, description, conf->nocase)))
-                       continue;
-               print_pkg(pkg);
+       args.set_status = 0;
+       pkg_hash_load_feeds(SF_NEED_DETAIL, opkg_list_find_cmd_cb, &args);
+
+       args.set_status = 1;
+       pkg_hash_load_status_files(opkg_list_find_cmd_cb, &args);
+
+       if (args.n_items > 1)
+               qsort(args.items, args.n_items, sizeof(args.items[0]),
+                     opkg_list_find_cmd_sort);
+
+       for (i = 0; i < args.n_items; i++) {
+               printf("%s - %s",
+                      args.items[i]->name,
+                      args.items[i]->version);
+
+               if (conf->size)
+                       printf(" - %lu", (unsigned long) args.items[i]->size);
+
+               if (args.items[i]->description)
+                       printf(" - %s", args.items[i]->description);
+
+               printf("\n");
+
+               free(args.items[i]);
        }
-       pkg_vec_free(available);
+
+       free(args.items);
 
        return 0;
 }
@@ -1289,10 +1354,8 @@ static opkg_cmd_t cmds[] = {
        {"find", 1, (opkg_cmd_fun_t) opkg_find_cmd, 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},
+       {"compare_versions", 1, (opkg_cmd_fun_t) opkg_compare_versions_cmd, 0},
+       {"compare-versions", 1, (opkg_cmd_fun_t) opkg_compare_versions_cmd, 0},
        {"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,