X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fpkg_depends.c;h=998d08544300fcc69117d389587c6e8a77368762;hp=10a8ab519437dafb245a74cfffbbc5ca15b1f547;hb=195ca08fef4a70f499cf6d5dc331820f45c54990;hpb=0f2a3b2ae317952ea4edf5a0004c698b41b0020e diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c index 10a8ab5..998d085 100644 --- a/libopkg/pkg_depends.c +++ b/libopkg/pkg_depends.c @@ -125,10 +125,10 @@ int pkg_hash_fetch_unsatisfied_dependencies(opkg_conf_t *conf, pkg_t * pkg, tmp_vec, &newstuff); if (newstuff == NULL) { - int i; + int m; int ok = 1; - for (i = 0; i < rc; i++) { - pkg_t *p = tmp_vec->pkgs[i]; + for (m = 0; m < rc; m++) { + pkg_t *p = tmp_vec->pkgs[m]; if (p->state_want == SW_INSTALL) continue; opkg_message(conf, OPKG_DEBUG, "not installing %s due to requirement for %s\n", pkg_scout->name, p->name); @@ -550,14 +550,13 @@ char ** add_unresolved_dep(pkg_t * pkg, char ** the_lost, int ref_ndx) { int count; char ** resized; - char *depend_str = pkg_depend_str(pkg, ref_ndx); count = 0; while(the_lost && the_lost[count]) count++; count++; /* need one to hold the null */ resized = xrealloc(the_lost, sizeof(char *) * (count + 1)); - resized[count - 1] = xstrdup(depend_str); + resized[count - 1] = pkg_depend_str(pkg, ref_ndx); resized[count] = NULL; return resized; @@ -576,11 +575,14 @@ void buildProvides(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) for (i=1; iprovides_count; i++) { abstract_pkg_t *provided_abpkg = ensure_abstract_pkg_by_name(hash, pkg->provides_str[i-1]); + free(pkg->provides_str[i-1]); pkg->provides[i] = provided_abpkg; abstract_pkg_vec_insert(provided_abpkg->provided_by, ab_pkg); } + if (pkg->provides_str) + free(pkg->provides_str); } /* Abhaya: added conflicts support */ @@ -597,8 +599,11 @@ void buildConflicts(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) conflicts->type = CONFLICTS; parseDepends(conflicts, hash, pkg->conflicts_str[i]); + free(pkg->conflicts_str[i]); conflicts++; } + if (pkg->conflicts_str) + free(pkg->conflicts_str); } void buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) @@ -614,6 +619,7 @@ void buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) abstract_pkg_t *old_abpkg = ensure_abstract_pkg_by_name(hash, pkg->replaces_str[i]); pkg->replaces[i] = old_abpkg; + free(pkg->replaces_str[i]); if (!old_abpkg->replaced_by) old_abpkg->replaced_by = abstract_pkg_vec_alloc(); @@ -623,6 +629,9 @@ void buildReplaces(hash_table_t * hash, abstract_pkg_t * ab_pkg, pkg_t * pkg) if (pkg_conflicts_abstract(pkg, old_abpkg)) abstract_pkg_vec_insert(old_abpkg->replaced_by, ab_pkg); } + + if (pkg->replaces_str) + free(pkg->replaces_str); } void buildDepends(hash_table_t * hash, pkg_t * pkg) @@ -638,59 +647,113 @@ void buildDepends(hash_table_t * hash, pkg_t * pkg) for(i = 0; i < pkg->pre_depends_count; i++){ parseDepends(depends, hash, pkg->pre_depends_str[i]); + free(pkg->pre_depends_str[i]); depends->type = PREDEPEND; depends++; } + if (pkg->pre_depends_str) + free(pkg->pre_depends_str); for(i = 0; i < pkg->depends_count; i++){ parseDepends(depends, hash, pkg->depends_str[i]); + free(pkg->depends_str[i]); depends++; } + if (pkg->depends_str) + free(pkg->depends_str); for(i = 0; i < pkg->recommends_count; i++){ parseDepends(depends, hash, pkg->recommends_str[i]); + free(pkg->recommends_str[i]); depends->type = RECOMMEND; depends++; } + if(pkg->recommends_str) + free(pkg->recommends_str); for(i = 0; i < pkg->suggests_count; i++){ parseDepends(depends, hash, pkg->suggests_str[i]); + free(pkg->suggests_str[i]); depends->type = SUGGEST; depends++; } + if(pkg->suggests_str) + free(pkg->suggests_str); +} + +const char* +constraint_to_str(enum version_constraint c) +{ + switch (c) { + case NONE: + return ""; + case EARLIER: + return "< "; + case EARLIER_EQUAL: + return "<= "; + case EQUAL: + return "= "; + case LATER_EQUAL: + return ">= "; + case LATER: + return "> "; + } + + return ""; } /* - * pkg_depend_string: returns the depends string specified by index. - * All 4 kinds of dependences: dependence, pre-dependence, recommend, and suggest are number starting from 0. - * [0,npredepends) -> returns pre_depends_str[index] - * [npredepends,npredepends+nrecommends) -> returns recommends_str[index] - * [npredepends+nrecommends,npredepends+nrecommends+nsuggests) -> returns recommends_str[index] - * [npredepends+nrecommends+nsuggests,npredepends+nrecommends+nsuggests+ndepends) -> returns depends_str[index] + * Returns a printable string for pkg's dependency at the specified index. The + * resultant string must be passed to free() by the caller. */ -char *pkg_depend_str(pkg_t *pkg, int index) +char * +pkg_depend_str(pkg_t *pkg, int index) { - if (index < pkg->pre_depends_count) { - return pkg->pre_depends_str[index]; - } - index -= pkg->pre_depends_count; + int i, len; + char *str; + compound_depend_t *cdep; + depend_t *dep; - if (index < pkg->depends_count) { - return pkg->depends_str[index]; - } - index -= pkg->depends_count; + len = 0; + cdep = &pkg->depends[index]; - if (index < pkg->recommends_count) { - return pkg->recommends_str[index]; - } - index -= pkg->recommends_count; + /* calculate string length */ + for (i=0; ipossibility_count; i++) { + dep = cdep->possibilities[i]; - if (index < pkg->suggests_count) { - return pkg->suggests_str[index]; - } + if (i != 0) + len += 3; /* space, pipe, space */ + + len += strlen(dep->pkg->name); + + if (dep->version) { + len += 2; /* space, left parenthesis */ + len += 3; /* constraint string (<=, >=, etc), space */ + len += strlen(dep->version); + len += 1; /* right parenthesis */ + } + } + + str = xmalloc(len + 1); /* +1 for the NULL terminator */ + str[0] = '\0'; + + for (i=0; ipossibility_count; i++) { + dep = cdep->possibilities[i]; + + if (i != 0) + strncat(str, " | ", len); + + strncat(str, dep->pkg->name, len); + + if (dep->version) { + strncat(str, " (", len); + strncat(str, constraint_to_str(dep->constraint), len); + strncat(str, dep->version, len); + strncat(str, ")", len); + } + } - fprintf(stderr, "pkg_depend_str: index %d out of range for pkg=%s\n", index, pkg->name); - return NULL; + return str; } /*