From 0692c29b44b32a5c1951bc0988c6db424780304b Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Sat, 4 Dec 1993 00:53:02 +0000
Subject: More changes to bring FreBSD in sync with Paul K's latest.

---
 libexec/rtld-aout/shlib.c | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'libexec/rtld-aout')

diff --git a/libexec/rtld-aout/shlib.c b/libexec/rtld-aout/shlib.c
index 64e2efc..b6cb74e 100644
--- a/libexec/rtld-aout/shlib.c
+++ b/libexec/rtld-aout/shlib.c
@@ -1,5 +1,5 @@
 /*
- * $Id: shlib.c,v 1.2 1993/11/09 04:19:03 paul Exp $
+ * $Id: shlib.c,v 1.4 1993/12/02 00:56:40 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -132,10 +132,9 @@ int	n1, n2;
 #undef minor
 
 char *
-findshlib(name, majorp, minorp, do_dot_a)
+findshlib(name, majorp, minorp)
 char	*name;
 int	*majorp, *minorp;
-int	do_dot_a;
 {
 	int		dewey[MAXDEWEY];
 	int		ndewey;
@@ -155,7 +154,6 @@ int	do_dot_a;
 	for (i = 0; i < n_search_dirs; i++) {
 		DIR		*dd = opendir(search_dirs[i]);
 		struct dirent	*dp;
-		int		found_dot_a = 0;
 
 		if (dd == NULL)
 			continue;
@@ -163,16 +161,6 @@ int	do_dot_a;
 		while ((dp = readdir(dd)) != NULL) {
 			int	n, j, might_take_it = 0;
 
-			if (do_dot_a && path == NULL &&
-					dp->d_namlen == len + 2 &&
-					strncmp(dp->d_name, lname, len) == 0 &&
-					(dp->d_name+len)[0] == '.' &&
-					(dp->d_name+len)[1] == 'a') {
-
-				path = concat(search_dirs[i], "/", dp->d_name);
-				found_dot_a = 1;
-			}
-
 			if (dp->d_namlen < len + 4)
 				continue;
 			if (strncmp(dp->d_name, lname, len) != 0)
@@ -183,12 +171,6 @@ int	do_dot_a;
 			if ((n = getdewey(tmp, dp->d_name+len+4)) == 0)
 				continue;
 
-			if (major != -1 && found_dot_a) { /* XXX */
-				free(path);
-				path = NULL;
-				found_dot_a = 0;
-			}
-
 			if (major == -1 && minor == -1) {
 				might_take_it = 1;
 			} else if (major != -1 && minor == -1) {
@@ -210,19 +192,12 @@ int	do_dot_a;
 			if (path)
 				free(path);
 			path = concat(search_dirs[i], "/", dp->d_name);
-			found_dot_a = 0;
 			bcopy(tmp, dewey, sizeof(dewey));
 			ndewey = n;
 			*majorp = dewey[0];
 			*minorp = dewey[1];
 		}
 		closedir(dd);
-
-		if (found_dot_a)
-			/*
-			 * There's a .a archive here.
-			 */
-			return path;
 	}
 
 	return path;
-- 
cgit v1.1