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.2.1.2.1
retrieving revision 1.43
diff -u -p -r1.36.2.1.2.1 -r1.43
--- src/lib/libc/gen/getcwd.c	2005/12/29 16:25:46	1.36.2.1.2.1
+++ src/lib/libc/gen/getcwd.c	2006/03/17 17:17:00	1.43
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcwd.c,v 1.36.2.1.2.1 2005/12/29 16:25:46 riz Exp $	*/
+/*	$NetBSD: getcwd.c,v 1.43 2006/03/17 17:17:00 christos 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.2.1.2.1 2005/12/29 16:25:46 riz Exp $");
+__RCSID("$NetBSD: getcwd.c,v 1.43 2006/03/17 17:17:00 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -96,7 +96,8 @@ realpath(const char *path, char *resolve
 
 	/* If relative path, start from current working directory. */
 	if (*path != '/') {
-		if (getcwd(resolved, MAXPATHLEN) == NULL) {
+		/* check for resolved pointer to appease coverity */
+		if (resolved && getcwd(resolved, MAXPATHLEN) == NULL) {
 			p[0] = '.';
 			p[1] = 0;
 			return (NULL);
@@ -159,13 +160,6 @@ loop:
 	 * target to unresolved path.
 	 */
 	if (lstat(resolved, &sb) == -1) {
-		/* Allow nonexistent component if this is the last one. */
-		while (*q == '/')
-			q++;
-
-		if (*q == 0  && errno == ENOENT)
-			return (resolved);
-
 		return (NULL);
 	}
 	if (S_ISLNK(sb.st_mode)) {