[gentoo-commits] proj/pax-utils:master commit in: /

["Mike Frysinger" <vapier@gentoo.org>]

commit:     02ab226f7ff6bcc4a5943c1c7e5aef3ccebc33e3
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 08:17:58 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 07:10:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=02ab226f

paxldso: delete netbsd cache logic

This doesn't actually parse the cache file, it walks the registered
ld.so.conf paths.  Since common code takes care of that via with the
--use-ldpaths option, delete the duplicate ldpath logic.

 paxldso.c | 28 ----------------------------
 paxldso.h |  3 +--
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/paxldso.c b/paxldso.c
index 638db77..67f317c 100644
--- a/paxldso.c
+++ b/paxldso.c
@@ -119,34 +119,6 @@ char *ldso_cache_lookup_lib(elfobj *elf, const char *fname)
 	return buf;
 }
 
-#elif defined(__NetBSD__)
-
-char *ldso_cache_lookup_lib(elfobj *elf, const char *fname)
-{
-	static char buf[__PAX_UTILS_PATH_MAX] = "";
-	static struct stat st;
-	size_t n;
-	char *ldpath;
-
-	array_for_each(ldpath, n, ldpath) {
-		if ((unsigned) snprintf(buf, sizeof(buf), "%s/%s", ldpath, fname) >= sizeof(buf))
-			continue; /* if the pathname is too long, or something went wrong, ignore */
-
-		if (stat(buf, &st) != 0)
-			continue; /* if the lib doesn't exist in *ldpath, look further */
-
-		/* NetBSD doesn't actually do sanity checks, it just loads the file
-		 * and if that doesn't work, continues looking in other directories.
-		 * This cannot easily be safely emulated, unfortunately. For now,
-		 * just assume that if it exists, it's a valid library. */
-
-		return buf;
-	}
-
-	/* not found in any path */
-	return NULL;
-}
-
 #endif
 
 static void ldso_cache_cleanup(void)

diff --git a/paxldso.h b/paxldso.h
index 2fdc540..bbf8852 100644
--- a/paxldso.h
+++ b/paxldso.h
@@ -14,8 +14,7 @@
  */
 
 #if !defined(__GLIBC__) && \
-    !defined(__UCLIBC__) && \
-    !defined(__NetBSD__)
+    !defined(__UCLIBC__)
 # ifdef __ELF__
 #  warning Cache support not implemented for your target
 # endif