Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/lib/libc/gen/getcwd.c,v
retrieving revision 1.36
retrieving revision 1.36.2.2
diff -u -p -r1.36 -r1.36.2.2
--- src/lib/libc/gen/getcwd.c	2005/01/30 22:37:32	1.36
+++ src/lib/libc/gen/getcwd.c	2005/12/29 16:23:31	1.36.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcwd.c,v 1.36 2005/01/30 22:37:32 enami Exp $	*/
+/*	$NetBSD: getcwd.c,v 1.36.2.2 2005/12/29 16:23:31 riz Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
 #else
-__RCSID("$NetBSD: getcwd.c,v 1.36 2005/01/30 22:37:32 enami Exp $");
+__RCSID("$NetBSD: getcwd.c,v 1.36.2.2 2005/12/29 16:23:31 riz Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -69,7 +69,7 @@ char *
 realpath(const char *path, char *resolved)
 {
 	struct stat sb;
-	int idx = 0, n, nlnk = 0, serrno = errno;
+	int idx = 0, n, nlnk = 0;
 	const char *q;
 	char *p, wbuf[2][MAXPATHLEN];
 	size_t len;
@@ -160,10 +160,12 @@ loop:
 	 */
 	if (lstat(resolved, &sb) == -1) {
 		/* Allow nonexistent component if this is the last one. */
-		if (*q == 0 && errno == ENOENT) {
-			errno = serrno;
+		while (*q == '/')
+			q++;
+
+		if (*q == 0  && errno == ENOENT)
 			return (resolved);
-		}
+
 		return (NULL);
 	}
 	if (S_ISLNK(sb.st_mode)) {
@@ -193,6 +195,10 @@ loop:
 			p = resolved;
 		goto loop;
 	}
+	if (*q == '/' && !S_ISDIR(sb.st_mode)) {
+		errno = ENOTDIR;
+		return (NULL);
+	}
 
 	/* Advance both resolved and unresolved path. */
 	p += 1 + q - path;