aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-04-01 17:40:11 -0400
committerMike Frysinger <vapier@gentoo.org>2016-04-01 17:40:11 -0400
commit46aea99b4b973d29db4f717fa72bcf3e1cb80f22 (patch)
treee1a697022c0ca2b49d308af3c7e60de1d4ad8f85
parentchange reinitialize type (diff)
downloadportage-utils-46aea99b4b973d29db4f717fa72bcf3e1cb80f22.tar.gz
portage-utils-46aea99b4b973d29db4f717fa72bcf3e1cb80f22.tar.bz2
portage-utils-46aea99b4b973d29db4f717fa72bcf3e1cb80f22.zip
qsearch: fix dirname/basename calls
Since dirname might modify its argument, make sure we call basename first so we don't end up with the dirname twice. URL: https://bugs.gentoo.org/578758 Reported-by: Kolbjørn Barmen <gentoo@kolla.no>
-rw-r--r--qsearch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/qsearch.c b/qsearch.c
index e23642b..1ebfccf 100644
--- a/qsearch.c
+++ b/qsearch.c
@@ -119,8 +119,9 @@ qsearch_ebuild_ebuild(int overlay_fd, const char *ebuild, const char *search_me,
}
if (show_it) {
+ const char *pkg = basename(p);
printf("%s%s/%s%s%s %s\n",
- BOLD, dirname(p), BLUE, basename(p), NORM,
+ BOLD, dirname(p), BLUE, pkg, NORM,
(show_name_only ? "" : q ? : "<no DESCRIPTION found>"));
}