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.8
retrieving revision 1.21
diff -u -p -r1.8 -r1.21
--- src/lib/libc/gen/getcwd.c	1998/02/02 02:41:23	1.8
+++ src/lib/libc/gen/getcwd.c	1999/08/10 13:03:11	1.21
@@ -1,4 +1,4 @@
-/*	$NetBSD: getcwd.c,v 1.8 1998/02/02 02:41:23 perry Exp $	*/
+/*	$NetBSD: getcwd.c,v 1.21 1999/08/10 13:03:11 fvdl Exp $	*/
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
 #else
-__RCSID("$NetBSD: getcwd.c,v 1.8 1998/02/02 02:41:23 perry Exp $");
+__RCSID("$NetBSD: getcwd.c,v 1.21 1999/08/10 13:03:11 fvdl Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -57,48 +57,21 @@ __RCSID("$NetBSD: getcwd.c,v 1.8 1998/02
 #include <string.h>
 #include <unistd.h>
 
+#include "extern.h"
+
 #ifdef __weak_alias
 __weak_alias(getcwd,_getcwd);
+__weak_alias(realpath,_realpath);
 #endif
 
-static char *getcwd_physical __P((char *, size_t));
-
 #define	ISDOT(dp) \
 	(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
 	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 
-char *
-getcwd(pt, size)
-	char *pt;
-	size_t size;
-{
-	char *pwd;
-	size_t pwdlen;
-	dev_t dev;
-	ino_t ino;
-	struct stat s;
 
-	/* Check $PWD -- if it's right, it's fast. */
-	if ((pwd = getenv("PWD")) != NULL && pwd[0] == '/' && !stat(pwd, &s)) {
-		dev = s.st_dev;
-		ino = s.st_ino;
-		if (!stat(".", &s) && dev == s.st_dev && ino == s.st_ino) {
-			pwdlen = strlen(pwd);
-			if (size != 0) {
-				if (pwdlen + 1 > size) {
-					errno = ERANGE;
-					return (NULL);
-				}
-			} else if ((pt = malloc(pwdlen + 1)) == NULL)
-				return (NULL);
-			memmove(pt, pwd, pwdlen);
-			pt[pwdlen] = '\0';
-			return (pt);
-		}
-	}
-		
-	return (getcwd_physical(pt, size));
-}
+#if defined(__SVR4) || defined(__svr4__)
+#define d_fileno d_ino
+#endif
 
 /*
  * char *realpath(const char *path, char resolved_path[MAXPATHLEN]);
@@ -113,7 +86,7 @@ realpath(path, resolved)
 	char *resolved;
 {
 	struct stat sb;
-	int fd, n, rootd, serrno;
+	int fd, n, rootd, serrno, nlnk = 0;
 	char *p, *q, wbuf[MAXPATHLEN];
 
 	/* Save the starting point. */
@@ -153,6 +126,10 @@ loop:
 	/* Deal with the last component. */
 	if (lstat(p, &sb) == 0) {
 		if (S_ISLNK(sb.st_mode)) {
+			if (nlnk++ >= MAXSYMLINKS) {
+				errno = ELOOP;
+				goto err1;
+			}
 			n = readlink(p, resolved, MAXPATHLEN);
 			if (n < 0)
 				goto err1;
@@ -170,13 +147,13 @@ loop:
 	 * Save the last component name and get the full pathname of
 	 * the current directory.
 	 */
-	(void)strcpy(wbuf, p);
+	(void)strncpy(wbuf, p, (sizeof(wbuf) - 1));
 
 	/*
 	 * Call the inernal internal version of getcwd which
 	 * does a physical search rather than using the $PWD short-cut
 	 */
-	if (getcwd_physical(resolved, MAXPATHLEN) == 0)
+	if (getcwd(resolved, MAXPATHLEN) == 0)
 		goto err1;
 
 	/*
@@ -194,8 +171,8 @@ loop:
 			goto err1;
 		}
 		if (rootd == 0)
-			(void)strcat(resolved, "/");
-		(void)strcat(resolved, wbuf);
+			(void)strcat(resolved, "/"); /* XXX: strcat is safe */
+		(void)strcat(resolved, wbuf);	/* XXX: strcat is safe */
 	}
 
 	/* Go back to where we came from. */
@@ -215,23 +192,26 @@ err2:	(void)close(fd);
 	return (NULL);
 }
 
-static char *
-getcwd_physical(pt, size)
+#ifdef OLD_GETCWD
+
+char *
+getcwd(pt, size)
 	char *pt;
 	size_t size;
 {
-	register struct dirent *dp;
-	register DIR *dir;
-	register dev_t dev;
-	register ino_t ino;
-	register int first;
-	register char *bpt, *bup;
+	struct dirent *dp;
+	DIR *dir;
+	dev_t dev;
+	ino_t ino;
+	int first;
+	char *bpt, *bup;
 	struct stat s;
 	dev_t root_dev;
 	ino_t root_ino;
 	size_t ptsize, upsize;
 	int save_errno;
 	char *ept, *eup, *up;
+	size_t dlen;
 
 	/*
 	 * If no buffer specified by the user, allocate one as necessary.
@@ -290,7 +270,7 @@ getcwd_physical(pt, size)
 			 * path to the beginning of the buffer, but it's always
 			 * been that way and stuff would probably break.
 			 */
-			bcopy(bpt, pt, ept - bpt);
+			memmove(pt, bpt,  (size_t)(ept - bpt));
 			free(up);
 			return (pt);
 		}
@@ -327,8 +307,14 @@ getcwd_physical(pt, size)
 			for (;;) {
 				if (!(dp = readdir(dir)))
 					goto notfound;
-				if (dp->d_fileno == ino)
+				if (dp->d_fileno == ino) {
+#if defined(__SVR4) || defined(__svr4__) || defined(__linux__)
+					dlen = strlen(dp->d_name);
+#else
+					dlen = dp->d_namlen;
+#endif
 					break;
+				}
 			}
 		} else
 			for (;;) {
@@ -336,7 +322,12 @@ getcwd_physical(pt, size)
 					goto notfound;
 				if (ISDOT(dp))
 					continue;
-				bcopy(dp->d_name, bup, dp->d_namlen + 1);
+#if defined(__SVR4) || defined(__svr4__) || defined(__linux__)
+				dlen = strlen(dp->d_name);
+#else
+				dlen = dp->d_namlen;
+#endif
+				memmove(bup, dp->d_name, dlen + 1);
 
 				/* Save the first error for later. */
 				if (lstat(up, &s)) {
@@ -353,7 +344,7 @@ getcwd_physical(pt, size)
 		 * Check for length of the current name, preceding slash,
 		 * leading slash.
 		 */
-		if (bpt - pt <= dp->d_namlen + (first ? 1 : 2)) {
+		if (bpt - pt <= dlen + (first ? 1 : 2)) {
 			size_t len, off;
 
 			if (!ptsize) {
@@ -366,13 +357,13 @@ getcwd_physical(pt, size)
 				goto err;
 			bpt = pt + off;
 			ept = pt + ptsize;
-			bcopy(bpt, ept - len, len);
+			memmove(ept - len, bpt, len);
 			bpt = ept - len;
 		}
 		if (!first)
 			*--bpt = '/';
-		bpt -= dp->d_namlen;
-		bcopy(dp->d_name, bpt, dp->d_namlen);
+		bpt -= dlen;
+		memmove(bpt, dp->d_name, dlen);
 		(void)closedir(dir);
 
 		/* Truncate any file name. */
@@ -394,3 +385,50 @@ err:
 	free(up);
 	return (NULL);
 }
+
+#else /* New getcwd */
+
+char *
+getcwd(pt, size)
+	char *pt;
+	size_t size;
+{
+	size_t ptsize, bufsize;
+	int len;
+	
+	/*
+	 * If no buffer specified by the user, allocate one as necessary.
+	 * If a buffer is specified, the size has to be non-zero.  The path
+	 * is built from the end of the buffer backwards.
+	 */
+	if (pt) {
+		ptsize = 0;
+		if (!size) {
+			errno = EINVAL;
+			return (NULL);
+		}
+		bufsize = size;
+	} else {
+		if ((pt = malloc(ptsize = 1024 - 4)) == NULL)
+			return (NULL);
+		bufsize = ptsize;
+	}
+	for (;;) {
+		len = __getcwd(pt, bufsize);
+		if ((len < 0) && (size == 0) && (errno == ERANGE)) {
+			if (ptsize > (MAXPATHLEN*4))
+				return NULL;
+			if ((pt = realloc(pt, ptsize *= 2)) == NULL)
+				return NULL;
+			bufsize = ptsize;
+			continue;
+		}
+		break;
+	}
+	if (len < 0)
+		return NULL;
+	else
+		return pt;
+}
+
+#endif