[src/netbsd-1-4]: src/sbin/ldconfig Pull up revision 1.30 (requested by matt):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c67d0a7ed13a
branches:  netbsd-1-4
changeset: 470675:c67d0a7ed13a
user:      he <he%NetBSD.org@localhost>
date:      Tue Jun 27 14:34:43 2000 +0000

description:
Pull up revision 1.30 (requested by matt):
  Do not treat non-existance of directories under /emul/aout as
  errors.

diffstat:

 sbin/ldconfig/ldconfig.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r b679b2ab50ee -r c67d0a7ed13a sbin/ldconfig/ldconfig.c
--- a/sbin/ldconfig/ldconfig.c  Tue Jun 27 14:32:06 2000 +0000
+++ b/sbin/ldconfig/ldconfig.c  Tue Jun 27 14:34:43 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ldconfig.c,v 1.22.2.2 2000/06/01 17:43:42 he Exp $     */
+/*     $NetBSD: ldconfig.c,v 1.22.2.3 2000/06/27 14:34:43 he Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -53,6 +53,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <link.h>
+#include <paths.h>
 
 #include "shlib.h"
 
@@ -219,6 +220,10 @@
        int             dewey[MAXDEWEY], ndewey;
 
        if ((dd = opendir(dir)) == NULL) {
+               /* /emul/aout directories are allowed to not exist.
+                */
+               if (!strncmp(dir, _PATH_EMUL_AOUT, sizeof(_PATH_EMUL_AOUT)-1))
+                       return 0;
                if (!silent || errno != ENOENT)
                        warn("%s", dir);
                return (-1);