static int opkg_list_cmd(opkg_conf_t *conf, int argc, char **argv);
static int opkg_info_cmd(opkg_conf_t *conf, int argc, char **argv);
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);
{"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-installed", 0, (opkg_cmd_fun_t)opkg_list_installed_cmd},
{"list_upgradable", 0, (opkg_cmd_fun_t)opkg_list_upgradable_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},
- {"install_pending", 0, (opkg_cmd_fun_t)opkg_install_pending_cmd},
{"install", 1, (opkg_cmd_fun_t)opkg_install_cmd},
{"remove", 1, (opkg_cmd_fun_t)opkg_remove_cmd},
{"purge", 1, (opkg_cmd_fun_t)opkg_purge_cmd},
static int opkg_finalize_intercepts(opkg_intercept_t ctx)
{
- char *cmd;
DIR *dir;
int err = 0;
sprintf_alloc (&path, "%s/%s", ctx->statedir, de->d_name);
if (access (path, X_OK) == 0) {
- xsystem (path);
+ const char *argv[] = {"sh", "-c", path, NULL};
+ xsystem (argv);
}
free (path);
}
} else
perror (ctx->statedir);
- sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
- err = xsystem (cmd);
- free (cmd);
-
+ rm_r(ctx->statedir);
free (ctx->statedir);
free (ctx);
return err;
}
-static int opkg_install_pending_cmd(opkg_conf_t *conf, int argc, char **argv)
-{
- int i, err;
- char *globpattern;
- glob_t globbuf;
-
- sprintf_alloc(&globpattern, "%s/*" OPKG_PKG_EXTENSION, conf->pending_dir);
- err = glob(globpattern, 0, NULL, &globbuf);
- free(globpattern);
- if (err) {
- return 0;
- }
-
- opkg_message(conf, OPKG_NOTICE,
- "The following packages in %s will now be installed.\n",
- conf->pending_dir);
- for (i = 0; i < globbuf.gl_pathc; i++) {
- opkg_message(conf, OPKG_NOTICE,
- "%s%s", i == 0 ? "" : " ", globbuf.gl_pathv[i]);
- }
- opkg_message(conf, OPKG_NOTICE, "\n");
- for (i = 0; i < globbuf.gl_pathc; i++) {
- err = opkg_install_from_file(conf, globbuf.gl_pathv[i]);
- if (err == 0) {
- err = unlink(globbuf.gl_pathv[i]);
- if (err) {
- opkg_message(conf, OPKG_ERROR,
- "%s: ERROR: failed to unlink %s: %s\n",
- __FUNCTION__, globbuf.gl_pathv[i], strerror(err));
- return err;
- }
- }
- }
- globfree(&globbuf);
-
- return err;
-}
-
static int opkg_remove_cmd(opkg_conf_t *conf, int argc, char **argv)
{
- int i,a,done;
+ int i, a, done;
pkg_t *pkg;
pkg_t *pkg_to_remove;
pkg_vec_t *available;
- char *pkg_name = NULL;
+
global_conf = conf;
+ done = 0;
+
signal(SIGINT, sigint_handler);
-// ENH: Add the "no pkg removed" just in case.
+ pkg_info_preinstall_check(conf);
- done = 0;
+ available = pkg_vec_alloc();
+ pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
- pkg_info_preinstall_check(conf);
- if ( argc > 0 ) {
- available = pkg_vec_alloc();
- pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
- for (i=0; i < argc; i++) {
- pkg_name = xcalloc(1, strlen(argv[i])+2);
- strcpy(pkg_name,argv[i]);
- for (a=0; a < available->len; a++) {
- pkg = available->pkgs[a];
- if (pkg_name && fnmatch(pkg_name, pkg->name, 0)) {
- continue;
- }
- if (conf->restrict_to_default_dest) {
- pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
- pkg->name,
- conf->default_dest);
- } else {
- pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
- }
+ for (i=0; i<argc; i++) {
+ for (a=0; a<available->len; a++) {
+ pkg = available->pkgs[a];
+ if (fnmatch(argv[i], pkg->name, 0)) {
+ continue;
+ }
+ if (conf->restrict_to_default_dest) {
+ pkg_to_remove = pkg_hash_fetch_installed_by_name_dest(&conf->pkg_hash,
+ pkg->name,
+ conf->default_dest);
+ } else {
+ pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
+ }
- if (pkg_to_remove == NULL) {
- opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
- continue;
- }
- if (pkg->state_status == SS_NOT_INSTALLED) { // Added the control, so every already removed package could be skipped
- opkg_message(conf, OPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
- continue;
- }
- opkg_remove_pkg(conf, pkg_to_remove,0);
- done = 1;
- }
- free (pkg_name);
+ if (pkg_to_remove == NULL) {
+ opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
+ continue;
+ }
+ if (pkg->state_status == SS_NOT_INSTALLED) { // Added the control, so every already removed package could be skipped
+ opkg_message(conf, OPKG_ERROR, "Package seems to be %s not installed (STATUS = NOT_INSTALLED).\n", pkg->name);
+ continue;
+ }
+ opkg_remove_pkg(conf, pkg_to_remove, 0);
+ done = 1;
}
- pkg_vec_free(available);
- } else {
- pkg_vec_t *installed_pkgs = pkg_vec_alloc();
- int i;
- int flagged_pkg_count = 0;
- int removed;
-
- pkg_hash_fetch_all_installed(&conf->pkg_hash, installed_pkgs);
-
- for (i = 0; i < installed_pkgs->len; i++) {
- pkg_t *pkg = installed_pkgs->pkgs[i];
- if (pkg->state_flag & SF_USER) {
- flagged_pkg_count++;
- } else {
- if (!pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL))
- opkg_message(conf, OPKG_NOTICE, "Non-user leaf package: %s\n", pkg->name);
- }
- }
- if (!flagged_pkg_count) {
- opkg_message(conf, OPKG_NOTICE, "No packages flagged as installed by user, \n"
- "so refusing to uninstall unflagged non-leaf packages\n");
- return 0;
- }
-
- /* find packages not flagged SF_USER (i.e., installed to
- * satisfy a dependence) and not having any dependents, and
- * remove them */
- do {
- removed = 0;
- for (i = 0; i < installed_pkgs->len; i++) {
- pkg_t *pkg = installed_pkgs->pkgs[i];
- if (!(pkg->state_flag & SF_USER)
- && !pkg_has_installed_dependents(conf, pkg->parent, pkg, NULL)) {
- removed++;
- opkg_message(conf, OPKG_NOTICE, "Removing non-user leaf package %s\n");
- opkg_remove_pkg(conf, pkg,0);
- done = 1;
- }
- }
- } while (removed);
- pkg_vec_free(installed_pkgs);
}
- if ( done == 0 )
+ pkg_vec_free(available);
+
+ if (done == 0)
opkg_message(conf, OPKG_NOTICE, "No packages removed.\n");
write_status_files_if_changed(conf);
return 0;
}
- files = pkg_get_installed_files(pkg);
+ files = pkg_get_installed_files(conf, pkg);
pkg_version = pkg_version_str_alloc(pkg);
printf("Package %s (%s) is installed on %s and has the following files:\n",
const char *target = argv[i];
int j;
- opkg_message(conf, OPKG_ERROR, "target=%s\n", target);
+ opkg_message(conf, OPKG_NOTICE, "target=%s\n", target);
for (j = 0; j < available_pkgs->len; j++) {
pkg_t *pkg = available_pkgs->pkgs[j];
if (fnmatch(target, pkg->name, 0) == 0) {
int k;
int count = pkg->depends_count + pkg->pre_depends_count;
- opkg_message(conf, OPKG_ERROR, "What %s (arch=%s) %s\n",
+ opkg_message(conf, OPKG_NOTICE, "What %s (arch=%s) %s\n",
target, pkg->architecture, rel_str);
for (k = 0; k < count; k++) {
compound_depend_t *cdepend = &pkg->depends[k];
int l;
for (l = 0; l < cdepend->possibility_count; l++) {
depend_t *possibility = cdepend->possibilities[l];
- opkg_message(conf, OPKG_ERROR, " %s", possibility->pkg->name);
+ opkg_message(conf, OPKG_NOTICE, " %s", possibility->pkg->name);
if (conf->verbosity >= OPKG_NOTICE) {
- opkg_message(conf, OPKG_NOTICE, " %s", possibility->version);
if (possibility->version) {
char *typestr = NULL;
+ opkg_message(conf, OPKG_NOTICE, " %s", possibility->version);
switch (possibility->constraint) {
case NONE: typestr = "none"; break;
case EARLIER: typestr = "<"; break;
opkg_message(conf, OPKG_NOTICE, " (%s %s)", typestr, possibility->version);
}
}
- opkg_message(conf, OPKG_ERROR, "\n");
+ opkg_message(conf, OPKG_NOTICE, "\n");
}
}
}
WHATSUGGESTS
};
-static int opkg_what_depends_conflicts_cmd(opkg_conf_t *conf, enum what_field_type what_field_type, int recursive, int argc, char **argv)
+static int opkg_what_depends_conflicts_cmd(opkg_conf_t *conf, enum depend_type what_field_type, int recursive, int argc, char **argv)
{
if (argc > 0) {
int changed;
switch (what_field_type) {
- case WHATDEPENDS: rel_str = "depends on"; break;
- case WHATCONFLICTS: rel_str = "conflicts with"; break;
- case WHATSUGGESTS: rel_str = "suggests"; break;
- case WHATRECOMMENDS: rel_str = "recommends"; break;
- case WHATPROVIDES: rel_str = "provides"; break;
- case WHATREPLACES: rel_str = "replaces"; break;
+ case DEPEND: rel_str = "depends on"; break;
+ case CONFLICTS: rel_str = "conflicts with"; break;
+ case SUGGEST: rel_str = "suggests"; break;
+ case RECOMMEND: rel_str = "recommends"; break;
+ default: return -1;
}
if (conf->query_all)
for (j = 0; j < available_pkgs->len; j++) {
pkg_t *pkg = available_pkgs->pkgs[j];
int k;
- int count = ((what_field_type == WHATCONFLICTS)
+ int count = ((what_field_type == CONFLICTS)
? pkg->conflicts_count
: pkg->pre_depends_count + pkg->depends_count + pkg->recommends_count + pkg->suggests_count);
/* skip this package if it is already marked */
}
for (k = 0; k < count; k++) {
compound_depend_t *cdepend =
- (what_field_type == WHATCONFLICTS) ? &pkg->conflicts[k] : &pkg->depends[k];
+ (what_field_type == CONFLICTS) ? &pkg->conflicts[k] : &pkg->depends[k];
int l;
+ if (what_field_type != cdepend->type)
+ continue;
for (l = 0; l < cdepend->possibility_count; l++) {
depend_t *possibility = cdepend->possibilities[l];
if (possibility->pkg->state_flag & SF_MARKED) {
static int opkg_whatdepends_recursively_cmd(opkg_conf_t *conf, int argc, char **argv)
{
- return opkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 1, argc, argv);
+ return opkg_what_depends_conflicts_cmd(conf, DEPEND, 1, argc, argv);
}
static int opkg_whatdepends_cmd(opkg_conf_t *conf, int argc, char **argv)
{
- return opkg_what_depends_conflicts_cmd(conf, WHATDEPENDS, 0, argc, argv);
+ return opkg_what_depends_conflicts_cmd(conf, DEPEND, 0, argc, argv);
}
static int opkg_whatsuggests_cmd(opkg_conf_t *conf, int argc, char **argv)
{
- return opkg_what_depends_conflicts_cmd(conf, WHATSUGGESTS, 0, argc, argv);
+ return opkg_what_depends_conflicts_cmd(conf, SUGGEST, 0, argc, argv);
}
static int opkg_whatrecommends_cmd(opkg_conf_t *conf, int argc, char **argv)
{
- return opkg_what_depends_conflicts_cmd(conf, WHATRECOMMENDS, 0, argc, argv);
+ return opkg_what_depends_conflicts_cmd(conf, RECOMMEND, 0, argc, argv);
}
static int opkg_whatconflicts_cmd(opkg_conf_t *conf, int argc, char **argv)
{
- return opkg_what_depends_conflicts_cmd(conf, WHATCONFLICTS, 0, argc, argv);
+ return opkg_what_depends_conflicts_cmd(conf, CONFLICTS, 0, argc, argv);
}
static int opkg_what_provides_replaces_cmd(opkg_conf_t *conf, enum what_field_type what_field_type, int argc, char **argv)
for (i=0; i < installed->len; i++) {
pkg = installed->pkgs[i];
- installed_files = pkg_get_installed_files(pkg);
+ installed_files = pkg_get_installed_files(conf, pkg);
for (iter = str_list_first(installed_files); iter; iter = str_list_next(installed_files, iter)) {
installed_file = (char *)iter->data;
projects / oweals / opkg-lede.git / blobdiff