From d13c42fa724b84ea010acd5b958ac0a1f1025b4d Mon Sep 17 00:00:00 2001 From: grant Date: Sat, 6 Nov 2004 15:09:22 +0000 Subject: pull up revision 1.38 from src: Remove some code which makes file lookup rely on the fact that the first two directory entries are "." and "..". This behaviour is not required by applicable standards, and actually not provided by "coda". Now we get the "." and ".." into the per-directiry hash tables, but this should not hurt. fixes bmake build on Fedora Core 2, PR pkg/26140 from Shoichi Miyake. --- bootstrap/bmake/dir.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'bootstrap/bmake') diff --git a/bootstrap/bmake/dir.c b/bootstrap/bmake/dir.c index afa027b36f2..a3d8a6cc8e4 100644 --- a/bootstrap/bmake/dir.c +++ b/bootstrap/bmake/dir.c @@ -1,4 +1,4 @@ -/* $NetBSD: dir.c,v 1.1.1.1 2004/03/11 13:04:07 grant Exp $ */ +/* $NetBSD: dir.c,v 1.2 2004/11/06 15:09:22 grant Exp $ */ /* * Copyright (c) 1988, 1989, 1990 The Regents of the University of California. @@ -39,20 +39,20 @@ */ #ifdef MAKE_BOOTSTRAP -static char rcsid[] = "$NetBSD: dir.c,v 1.1.1.1 2004/03/11 13:04:07 grant Exp $"; +static char rcsid[] = "$NetBSD: dir.c,v 1.2 2004/11/06 15:09:22 grant Exp $"; #else #include #ifndef lint #if 0 static char sccsid[] = "@(#)dir.c 8.2 (Berkeley) 1/2/94"; #else -__RCSID("$NetBSD: dir.c,v 1.1.1.1 2004/03/11 13:04:07 grant Exp $"); +__RCSID("$NetBSD: dir.c,v 1.2 2004/11/06 15:09:22 grant Exp $"); #endif #endif /* not lint */ #endif #if !defined(MAKE_BOOTSTRAP) && !defined(lint) -__IDSTRING(rcs_id,"$Id: dir.c,v 1.1.1.1 2004/03/11 13:04:07 grant Exp $"); +__IDSTRING(rcs_id,"$Id: dir.c,v 1.2 2004/11/06 15:09:22 grant Exp $"); #endif /*- @@ -1252,12 +1252,6 @@ Dir_AddDir (path, name) p->refCount = 1; Hash_InitTable (&p->files, -1); - /* - * Skip the first two entries -- these will *always* be . and .. - */ - (void)readdir(d); - (void)readdir(d); - while ((dp = readdir (d)) != (struct dirent *) NULL) { #if defined(sun) && defined(d_ino) /* d_ino is a sunos4 #define for d_fileno */ /* -- cgit v1.2.3