Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't barf if builtin directories happen to be non-existent.

Browse Source
This commit is contained in:
pk 1994-01-13 19:35:38 +00:00
parent b192754e19
commit 14c0d3cb5e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/usr.bin/ld/ldconfig/ldconfig.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: ldconfig.c,v 1.2 1993/12/08 10:16:37 pk Exp $ * $Id: ldconfig.c,v 1.3 1994/01/13 19:35:38 pk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -72,7 +72,7 @@ struct shlib_list {
static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head; static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head;
static void enter __P((char *, char *, char *, int *, int)); static void enter __P((char *, char *, char *, int *, int));
static int dodir __P((char *)); static int dodir __P((char *, int));
static int build_hints __P((void)); static int build_hints __P((void));
int int
@ -114,10 +114,10 @@ char *argv[];
std_search_dirs(NULL); std_search_dirs(NULL);
for (i = 0; i < n_search_dirs; i++) for (i = 0; i < n_search_dirs; i++)
rval |= dodir(search_dirs[i]); rval |= dodir(search_dirs[i], 1);
for (i = optind; i < argc; i++) for (i = optind; i < argc; i++)
rval |= dodir(argv[i]); rval |= dodir(argv[i], 0);
rval |= build_hints(); rval |= build_hints();
@ -125,8 +125,9 @@ char *argv[];
} }
int int
dodir(dir) dodir(dir, silent)
char *dir; char *dir;
int silent;
{ {
DIR *dd; DIR *dd;
struct dirent *dp; struct dirent *dp;
@ -134,7 +135,8 @@ char *dir;
int dewey[MAXDEWEY], ndewey; int dewey[MAXDEWEY], ndewey;
if ((dd = opendir(dir)) == NULL) { if ((dd = opendir(dir)) == NULL) {
perror(dir); if (!silent || errno != ENOENT)
perror(dir);
return -1; return -1;
} }

14
sbin/ldconfig/ldconfig.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: ldconfig.c,v 1.2 1993/12/08 10:16:37 pk Exp $ * $Id: ldconfig.c,v 1.3 1994/01/13 19:35:38 pk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -72,7 +72,7 @@ struct shlib_list {
static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head; static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head;
static void enter __P((char *, char *, char *, int *, int)); static void enter __P((char *, char *, char *, int *, int));
static int dodir __P((char *)); static int dodir __P((char *, int));
static int build_hints __P((void)); static int build_hints __P((void));
int int
@ -114,10 +114,10 @@ char *argv[];
std_search_dirs(NULL); std_search_dirs(NULL);
for (i = 0; i < n_search_dirs; i++) for (i = 0; i < n_search_dirs; i++)
rval |= dodir(search_dirs[i]); rval |= dodir(search_dirs[i], 1);
for (i = optind; i < argc; i++) for (i = optind; i < argc; i++)
rval |= dodir(argv[i]); rval |= dodir(argv[i], 0);
rval |= build_hints(); rval |= build_hints();
@ -125,8 +125,9 @@ char *argv[];
} }
int int
dodir(dir) dodir(dir, silent)
char *dir; char *dir;
int silent;
{ {
DIR *dd; DIR *dd;
struct dirent *dp; struct dirent *dp;
@ -134,7 +135,8 @@ char *dir;
int dewey[MAXDEWEY], ndewey; int dewey[MAXDEWEY], ndewey;
if ((dd = opendir(dir)) == NULL) { if ((dd = opendir(dir)) == NULL) {
perror(dir); if (!silent || errno != ENOENT)
perror(dir);
return -1; return -1;
} }