From: Karel Zak <kzak@redhat.com>
Date: Thu, 17 Jan 2019 10:19:27 +0000 (+0100)
Subject: whereis: search in /(s)bin before /usr/lib
X-Git-Tag: v2.34-rc1~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ed2117897dadcfed28f3d0cd9c23e92ba9e1c6c;p=thirdparty%2Futil-linux.git

whereis: search in /(s)bin before /usr/lib

Addresses: https://github.com/karelzak/util-linux/issues/741
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 828106ffe7..c598d494e8 100644
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -99,6 +99,8 @@ struct wh_dirlist {
 static const char *bindirs[] = {
 	"/usr/bin",
 	"/usr/sbin",
+	"/bin",
+	"/sbin",
 #if defined(MULTIARCHTRIPLET)
 	"/lib/" MULTIARCHTRIPLET,
 	"/usr/lib/" MULTIARCHTRIPLET,
@@ -106,8 +108,6 @@ static const char *bindirs[] = {
 #endif
 	"/usr/lib",
 	"/usr/lib64",
-	"/bin",
-	"/sbin",
 	"/etc",
 	"/usr/etc",
 	"/lib",