sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
pkglist_dl_error = 0;
- if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
+ if (opkg_download(url, list_file_name, 0)) {
failures++;
pkglist_dl_error = 1;
opkg_msg(NOTICE,
sprintf_alloc(&tmp_file_name, "%s/%s.sig", lists_dir,
src->name);
- err = opkg_download(url, tmp_file_name, NULL, NULL, 0);
+ err = opkg_download(url, tmp_file_name, 0);
if (err) {
failures++;
opkg_msg(NOTICE,
ctx = xcalloc(1, sizeof(*ctx));
ctx->oldpath = xstrdup(getenv("PATH"));
- sprintf_alloc(&newpath, "%s/opkg/intercept:%s", DATADIR, ctx->oldpath);
+
+ sprintf_alloc(&newpath, "%s/opkg/intercept:%s", DATADIR,
+ ctx->oldpath ? ctx->oldpath : PATH_SPEC);
+
sprintf_alloc(&ctx->statedir, "%s/opkg-intercept-XXXXXX",
- conf->tmp_dir);
+ conf->tmp_dir);
if (mkdtemp(ctx->statedir) == NULL) {
opkg_perror(ERROR, "Failed to make temp dir %s", ctx->statedir);
- free(ctx->oldpath);
+
+ if (ctx->oldpath)
+ free(ctx->oldpath);
+
free(ctx->statedir);
free(newpath);
free(ctx);
DIR *dir;
int err = 0;
- setenv("PATH", ctx->oldpath, 1);
- free(ctx->oldpath);
+ if (ctx->oldpath) {
+ setenv("PATH", ctx->oldpath, 1);
+ free(ctx->oldpath);
+ }
+ else {
+ unsetenv("PATH");
+ }
dir = opendir(ctx->statedir);
if (dir) {
sprintf_alloc(&path, "%s/%s", ctx->statedir,
de->d_name);
if (access(path, X_OK) == 0) {
- const char *argv[] = { "sh", "-c", path, NULL };
+ const char *argv[] = { "/bin/sh", "-c", path, NULL };
xsystem(argv);
}
free(path);
}
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;
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;
}
static int opkg_compare_versions_cmd(int argc, char **argv)
{
+ int rc;
+ pkg_t *p1, *p2;
+
if (argc == 3) {
/* this is a bit gross */
- struct pkg p1, p2;
- parse_version(&p1, argv[0]);
- parse_version(&p2, argv[2]);
- return pkg_version_satisfied(&p1, &p2, argv[1]);
+ p1 = pkg_new();
+ p2 = pkg_new();
+ parse_version(p1, argv[0]);
+ parse_version(p2, argv[2]);
+ rc = pkg_version_satisfied(p1, p2, argv[1]);
+ pkg_deinit(p1);
+ pkg_deinit(p2);
+ free(p1);
+ free(p2);
+ return rc ? 0 : 1;
} else {
opkg_msg(ERROR,
"opkg compare_versions <v1> <op> <v2>\n"
{"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,
projects / oweals / opkg-lede.git / blobdiff