From owner-p4-projects@FreeBSD.ORG  Fri Mar 19 17:00:48 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE21816A4D0; Fri, 19 Mar 2004 17:00:47 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C772316A4CE
	for <perforce@freebsd.org>; Fri, 19 Mar 2004 17:00:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BE79C43D2F
	for <perforce@freebsd.org>; Fri, 19 Mar 2004 17:00:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i2K10lGe034234
	for <perforce@freebsd.org>; Fri, 19 Mar 2004 17:00:47 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2K10k9Q034227
	for perforce@freebsd.org; Fri, 19 Mar 2004 17:00:46 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 19 Mar 2004 17:00:46 -0800 (PST)
Message-Id: <200403200100.i2K10k9Q034227@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 49320 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Mar 2004 01:00:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=49320

Change 49320 by peter@peter_overcee on 2004/03/19 17:00:19

	add -32 option to ldconfig. ugh!

Affected files ...

.. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#4 edit

Differences ...

==== //depot/projects/hammer/sbin/ldconfig/ldconfig.c#4 (text+ko) ====

@@ -63,6 +63,9 @@
 #define _PATH_ELF_HINTS		"./ld-elf.so.hints"
 #endif
 
+#define	_PATH_LD32_HINTS	"/var/run/ld32.so.hints"
+#define	_PATH_ELF32_HINTS	"/var/run/ld-elf32.so.hints"
+
 #undef major
 #undef minor
 
@@ -102,20 +105,31 @@
 {
 	int		i, c;
 	int		rval = 0;
-	int		is_aout;
+	int		is_aout = 0;
+	int		is_32 = 0;
 
-	is_aout = 0;
-	if (argc > 1 && strcmp(argv[1], "-aout") == 0) {
-		is_aout = 1;
-		argc--;
-		argv++;
-	} else if (argc > 1 && strcmp(argv[1], "-elf") == 0) {
-		/* skip over legacy -elf arg */
-		argc--;
-		argv++;
+	while (argc > 1) {
+		if (strcmp(argv[1], "-aout") == 0) {
+			is_aout = 1;
+			argc--;
+			argv++;
+		} else if (strcmp(argv[1], "-elf") == 0) {
+			is_aout = 0;
+			argc--;
+			argv++;
+		} else if (strcmp(argv[1], "-32") == 0) {
+			is_32 = 1;
+			argc--;
+			argv++;
+		} else {
+			break;
+		}
 	}
 
-	hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS;
+	if (is_32)
+		hints_file = is_aout ? _PATH_LD32_HINTS : _PATH_ELF32_HINTS;
+	else
+		hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS;
 	if (argc == 1)
 		rescan = 1;
 	else while((c = getopt(argc, argv, "Rf:imrsv")) != -1) {