diff --git a/src/pactree.c b/src/pactree.c index e34ecc8..4bd4601 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -383,6 +383,14 @@ static int parse_options(int argc, char *argv[]) return 0; } +int pkg_provides_itself(const char *pkg, const char *depstring) +{ + size_t pkglen = strlen(pkg); + return (strncmp(pkg, depstring, pkglen) == 0 && + (depstring[pkglen] == '\0' || + strncmp(": ", depstring + pkglen, 2) == 0)); +} + /* pkg provides provision */ static void print_text(const char *pkg, const char *provision, tdepth *depth, int last, int opt_dep) @@ -419,12 +427,12 @@ static void print_text(const char *pkg, const char *provision, if(!pkg && provision) { printf("%s%s%s%s [unresolvable]%s%s\n", tip, color->leaf1, provision, color->branch1, opt_str, color->off); - } else if(provision && strcmp(pkg, provision) != 0 && *(style->provides) != '\0') { + } else if(provision && *(style->provides) != '\0' && !pkg_provides_itself(pkg, provision)) { printf("%s%s%s%s%s %s%s%s%s\n", tip, color->leaf1, pkg, color->leaf2, style->provides, color->leaf1, provision, opt_str, color->off); } else { - printf("%s%s%s%s%s\n", tip, color->leaf1, pkg, opt_str, color->off); + printf("%s%s%s%s%s\n", tip, color->leaf1, (provision ? provision : pkg), opt_str, color->off); } }