| 1 |
commit: 46aea99b4b973d29db4f717fa72bcf3e1cb80f22 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 1 21:40:11 2016 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 1 21:40:11 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=46aea99b |
| 7 |
|
| 8 |
qsearch: fix dirname/basename calls |
| 9 |
|
| 10 |
Since dirname might modify its argument, make sure we call basename |
| 11 |
first so we don't end up with the dirname twice. |
| 12 |
|
| 13 |
URL: https://bugs.gentoo.org/578758 |
| 14 |
Reported-by: Kolbjørn Barmen <gentoo <AT> kolla.no> |
| 15 |
|
| 16 |
qsearch.c | 3 ++- |
| 17 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/qsearch.c b/qsearch.c |
| 20 |
index e23642b..1ebfccf 100644 |
| 21 |
--- a/qsearch.c |
| 22 |
+++ b/qsearch.c |
| 23 |
@@ -119,8 +119,9 @@ qsearch_ebuild_ebuild(int overlay_fd, const char *ebuild, const char *search_me, |
| 24 |
} |
| 25 |
|
| 26 |
if (show_it) { |
| 27 |
+ const char *pkg = basename(p); |
| 28 |
printf("%s%s/%s%s%s %s\n", |
| 29 |
- BOLD, dirname(p), BLUE, basename(p), NORM, |
| 30 |
+ BOLD, dirname(p), BLUE, pkg, NORM, |
| 31 |
(show_name_only ? "" : q ? : "<no DESCRIPTION found>")); |
| 32 |
} |
Archives