#include "includes.h"
#include <dirent.h>
#include <glob.h>
+#include <fnmatch.h>
#include "opkg_conf.h"
#include "opkg_cmd.h"
#include "libbb/libbb.h"
#include "opkg_utils.h"
#include "opkg_defines.h"
-
-#include <fnmatch.h>
-
-
#include "opkg_download.h"
#include "opkg_install.h"
#include "opkg_upgrade.h"
#include "opkg_remove.h"
#include "opkg_configure.h"
#include "opkg_message.h"
-
#include "libopkg.h"
+#include "xsystem.h"
static int opkg_update_cmd(opkg_conf_t *conf, int argc, char **argv);
static int opkg_upgrade_cmd(opkg_conf_t *conf, int argc, char **argv);
"%s: ERROR: %s exists, but is not a directory\n",
__FUNCTION__, lists_dir);
free(lists_dir);
- return EINVAL;
+ return -1;
}
err = file_mkdir_hier(lists_dir, 0755);
if (err) {
"%s: ERROR: failed to make directory %s: %s\n",
__FUNCTION__, lists_dir, strerror(errno));
free(lists_dir);
- return EINVAL;
+ return -1;
}
}
failures = 0;
-
- tmp = strdup ("/tmp/opkg.XXXXXX");
-
+ sprintf_alloc(&tmp, "%s/update-XXXXXX", conf->tmp_dir);
if (mkdtemp (tmp) == NULL) {
perror ("mkdtemp");
- failures++;
+ return -1;
}
static opkg_intercept_t opkg_prep_intercepts(opkg_conf_t *conf)
{
opkg_intercept_t ctx;
- char *oldpath;
char *newpath;
- int gen;
-
- ctx = calloc (1, sizeof (*ctx));
- oldpath = getenv ("PATH");
- if (oldpath) {
- ctx->oldpath = strdup (oldpath);
- } else {
- ctx->oldpath = 0;
- }
-
- sprintf_alloc (&newpath, "%s/opkg/intercept:%s", DATADIR, ctx->oldpath);
- setenv ("PATH", newpath, 1);
- free (newpath);
-
- gen = 0;
- retry:
- sprintf_alloc (&ctx->statedir, "/tmp/opkg-intercept-%d-%d", getpid (), gen);
- if (mkdir (ctx->statedir, 0770) < 0) {
- if (errno == EEXIST) {
- free (ctx->statedir);
- gen++;
- goto retry;
- }
- perror (ctx->statedir);
+ ctx = xcalloc(1, sizeof (*ctx));
+ ctx->oldpath = xstrdup(getenv("PATH"));
+ sprintf_alloc(&newpath, "%s/opkg/intercept:%s", DATADIR, ctx->oldpath);
+ sprintf_alloc(&ctx->statedir, "%s/opkg-intercept-XXXXXX", conf->tmp_dir);
+
+ if (mkdtemp(ctx->statedir) == NULL) {
+ fprintf(stderr, "%s: mkdtemp: %s\n", __FUNCTION__, strerror(errno));
+ free(ctx->oldpath);
+ free(ctx->statedir);
+ free(newpath);
+ free(ctx);
return NULL;
}
- setenv ("OPKG_INTERCEPT_DIR", ctx->statedir, 1);
+
+ setenv("OPKG_INTERCEPT_DIR", ctx->statedir, 1);
+ setenv("PATH", newpath, 1);
+ free(newpath);
+
return ctx;
}
static int opkg_finalize_intercepts(opkg_intercept_t ctx)
{
- char *cmd;
DIR *dir;
int err = 0;
- if (ctx->oldpath) {
- setenv ("PATH", ctx->oldpath, 1);
- free (ctx->oldpath);
- } else {
- unsetenv("PATH");
- }
+ setenv ("PATH", ctx->oldpath, 1);
+ free (ctx->oldpath);
dir = opendir (ctx->statedir);
if (dir) {
struct dirent *de;
while (de = readdir (dir), de != NULL) {
char *path;
-
+
if (de->d_name[0] == '.')
continue;
sprintf_alloc (&path, "%s/%s", ctx->statedir, de->d_name);
if (access (path, X_OK) == 0) {
- if (system (path)) {
- err = errno;
- perror (de->d_name);
- }
+ const char *argv[] = {"sh", "-c", path, NULL};
+ xsystem (argv);
}
free (path);
}
} else
perror (ctx->statedir);
- sprintf_alloc (&cmd, "rm -rf %s", ctx->statedir);
- err = system (cmd);
- free (cmd);
-
+ rm_r(ctx->statedir);
free (ctx->statedir);
free (ctx);
static int opkg_configure_packages(opkg_conf_t *conf, char *pkg_name)
{
- pkg_vec_t *all, *ordered, *visited;
+ pkg_vec_t *all, *ordered, *visited;
int i;
pkg_t *pkg;
opkg_intercept_t ic;
opkg_recurse_pkgs_in_order(conf, pkg, all, visited, ordered);
}
-
ic = opkg_prep_intercepts (conf);
+ if (ic == NULL) {
+ err = -1;
+ goto error;
+ }
for(i = 0; i < all->len; i++) {
pkg = all->pkgs[i];
if (r && !err)
err = r;
+error:
pkg_vec_free(all);
pkg_vec_free(ordered);
pkg_vec_free(visited);
}
}
- /* recheck to verify that all dependences are satisfied */
- if (0) opkg_satisfy_all_dependences(conf);
-
opkg_configure_packages(conf, NULL);
write_status_files_if_changed(conf);
pkg_vec_free(installed);
}
- /* recheck to verify that all dependences are satisfied */
- if (0) opkg_satisfy_all_dependences(conf);
-
opkg_configure_packages(conf, NULL);
write_status_files_if_changed(conf);
pkg_formatted_info(stdout, pkg);
- if (conf->verbosity > 1) {
+ if (conf->verbosity >= OPKG_NOTICE) {
conffile_list_elt_t *iter;
for (iter = nv_pair_list_first(&pkg->conffiles); iter; iter = nv_pair_list_next(&pkg->conffiles, iter)) {
conffile_t *cf = (conffile_t *)iter->data;
available = pkg_vec_alloc();
pkg_hash_fetch_all_installed(&conf->pkg_hash, available);
for (i=0; i < argc; i++) {
- pkg_name = calloc(1, strlen(argv[i])+2);
+ pkg_name = xcalloc(1, strlen(argv[i])+2);
strcpy(pkg_name,argv[i]);
for (a=0; a < available->len; a++) {
pkg = available->pkgs[a];
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);
- if (conf->verbosity > 0) {
- // char *ver = abstract_pkg_version_str_alloc(possibility->pkg);
- opkg_message(conf, OPKG_NOTICE, " %s", possibility->version);
+ opkg_message(conf, OPKG_NOTICE, " %s", possibility->pkg->name);
+ if (conf->verbosity >= OPKG_NOTICE) {
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);
}
- // free(ver);
}
- 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) {
pkg_mark_provides(pkg);
changed++;
- opkg_message(conf, OPKG_NOTICE, " %s", pkg->name);
- if (conf->verbosity > 0) {
+ if (conf->verbosity >= OPKG_NOTICE) {
char *ver = pkg_version_str_alloc(pkg);
+ opkg_message(conf, OPKG_NOTICE, " %s", pkg->name);
opkg_message(conf, OPKG_NOTICE, " %s", ver);
opkg_message(conf, OPKG_NOTICE, "\t%s %s", rel_str, possibility->pkg->name);
if (possibility->version) {
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;
if (argc == 3) {
/* this is a bit gross */
struct pkg p1, p2;
- parseVersion(&p1, argv[0]);
- parseVersion(&p2, argv[2]);
+ parse_version(&p1, argv[0]);
+ parse_version(&p2, argv[2]);
return pkg_version_satisfied(&p1, &p2, argv[1]);
} else {
opkg_message(conf, OPKG_ERROR,
projects / oweals / opkg-lede.git / blobdiff