aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1993-11-30 20:47:54 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1993-11-30 20:47:54 +0000
commit52c4ca7af3f8ff112cb52086909057047ce5df91 (patch)
tree9392aab4f81d6be4eb1228cfb19ddc38026587ce /sbin
parent0da22b8b69bc472f4ef12bd918f6c2a6ff4d6021 (diff)
downloadsrc-52c4ca7af3f8ff112cb52086909057047ce5df91.tar.gz
src-52c4ca7af3f8ff112cb52086909057047ce5df91.zip
Many recent fixes from Paul K, add support for chaining of shared lib deps.
Notes
Notes: svn path=/head/; revision=811
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ldconfig/ldconfig.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index b4b9981c81d9..899539de21f8 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.c
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $Id: ldconfig.c,v 1.1 1993/10/23 00:17:03 pk Exp $
+ * $Id: ldconfig.c,v 1.2 1993/11/09 04:19:22 paul Exp $
*/
#include <sys/param.h>
@@ -58,7 +58,6 @@ static int verbose;
static int nostd;
static int justread;
-#define MAXDEWEY 8
struct shlib_list {
/* Internal list of shared libraries found */
char *name;
@@ -401,9 +400,13 @@ listhints()
return -1;
}
- printf("\t-l%s.%d.%d => %s\n",
+ printf("\t%d:-l%s.%d.%d => %s (%d -> %d)\n",
+ i,
strtab + bp->hi_namex, bp->hi_major, bp->hi_minor,
- strtab + bp->hi_pathx);
+ strtab + bp->hi_pathx,
+ hinthash(strtab+bp->hi_namex, bp->hi_major, bp->hi_minor)
+ % hdr->hh_nbucket,
+ bp->hi_next);
}
return 0;