--- Libc/Libc-391/stdlib/FreeBSD/realpath.c.patch
+++ Libc/Libc-763.13/stdlib/FreeBSD/realpath.c.patch
@@ -1,6 +1,6 @@
---- realpath.c.orig	2003-08-15 19:22:17.000000000 -0700
-+++ realpath.c	2004-12-04 14:47:52.000000000 -0800
-@@ -35,13 +35,35 @@
+--- realpath.c.orig	2010-06-24 17:32:55.000000000 -0700
++++ realpath.c	2010-06-25 13:46:50.000000000 -0700
+@@ -35,13 +35,41 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/
  #include "namespace.h"
  #include <sys/param.h>
  #include <sys/stat.h>
@@ -23,7 +23,8 @@
 +	char buf[PATH_MAX];
 +};
 +
-+static struct attrlist alist = {
++#ifndef BUILDING_VARIANT
++__private_extern__ struct attrlist _rp_alist = {
 +	ATTR_BIT_MAP_COUNT,
 +	0,
 +	ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_OBJTYPE | ATTR_CMN_OBJID,
@@ -32,13 +33,21 @@
 +	0,
 +	0,
 +};
++#else /* BUILDING_VARIANT */
++__private_extern__ struct attrlist _rp_alist;
++#endif /* BUILDING_VARIANT */
++
++extern char * __private_getcwd(char *, size_t, int);
 +
  /*
   * char *realpath(const char *path, char resolved[PATH_MAX]);
   *
-@@ -52,13 +74,25 @@
+@@ -50,36 +78,89 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/
+  * in which case the path which caused trouble is left in (resolved).
+  */
  char *
- realpath(const char *path, char resolved[PATH_MAX])
+-realpath(const char *path, char resolved[PATH_MAX])
++realpath(const char *path, char inresolved[PATH_MAX])
  {
 +	struct attrs attrs;
  	struct stat sb;
@@ -54,30 +63,101 @@
 +	static dev_t rootdev;
 +	static int rootdev_inited = 0;
 +	ino_t inode;
- 
++	char *resolved;
+ 
++	if (path == NULL) {
++		errno = EINVAL;
++		return (NULL);
++	}
++#if __DARWIN_UNIX03
++	if (*path == 0) {
++		errno = ENOENT;
++		return (NULL);
++	}
++#endif /* __DARWIN_UNIX03 */
++	/*
++	 * Extension to the standard; if inresolved == NULL, allocate memory
++	 */
++	if (!inresolved) {
++	    if ((resolved = malloc(PATH_MAX)) == NULL) return (NULL);
++	} else {
++	    resolved = inresolved;
++	}
 +	if (!rootdev_inited) {
 +		rootdev_inited = 1;
-+		if (stat("/", &sb) < 0)
++		if (stat("/", &sb) < 0) {
++error_return:
++			if (!inresolved) {
++				int e = errno;
++				free(resolved);
++				errno = e;
++			}
 +			return (NULL);
++		}
 +		rootdev = sb.st_dev;
 +	}
  	serrno = errno;
  	symlinks = 0;
  	if (path[0] == '/') {
-@@ -80,6 +114,12 @@
+ 		resolved[0] = '/';
+ 		resolved[1] = '\0';
+-		if (path[1] == '\0')
++		if (path[1] == '\0') {
+ 			return (resolved);
++		}
+ 		resolved_len = 1;
+ 		left_len = strlcpy(left, path + 1, sizeof(left));
+ 	} else {
+-		if (getcwd(resolved, PATH_MAX) == NULL) {
++#if !defined(VARIANT_DARWINEXTSN) && __DARWIN_UNIX03
++		/* 4447159: don't use GETPATH, so this will fail if */
++		/* if parent directories are not readable, as per POSIX */
++		if (__private_getcwd(resolved, PATH_MAX, 0) == NULL)
++#else /* VARIANT_DARWINEXTSN || !__DARWIN_UNIX03 */
++		if (__private_getcwd(resolved, PATH_MAX, 1) == NULL)
++#endif /* !VARIANT_DARWINEXTSN && __DARWIN_UNIX03 */
++		{
+ 			strlcpy(resolved, ".", PATH_MAX);
+-			return (NULL);
++			goto error_return;
+ 		}
+ 		resolved_len = strlen(resolved);
+ 		left_len = strlcpy(left, path, sizeof(left));
+ 	}
+ 	if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
  		errno = ENAMETOOLONG;
- 		return (NULL);
+-		return (NULL);
++		goto error_return;
  	}
 +	if (resolved_len > 1) {
-+		if (stat(resolved, &sb) < 0)
-+			return (NULL);
++		if (stat(resolved, &sb) < 0) {
++			goto error_return;
++		}
 +		lastdev = sb.st_dev;
 +	} else
 +		lastdev = rootdev;
  
  	/*
  	 * Iterate over path components in `left'.
-@@ -127,6 +167,13 @@
+@@ -93,7 +174,7 @@ realpath(const char *path, char resolved
+ 		s = p ? p : left + left_len;
+ 		if (s - left >= sizeof(next_token)) {
+ 			errno = ENAMETOOLONG;
+-			return (NULL);
++			goto error_return;
+ 		}
+ 		memcpy(next_token, left, s - left);
+ 		next_token[s - left] = '\0';
+@@ -103,7 +184,7 @@ realpath(const char *path, char resolved
+ 		if (resolved[resolved_len - 1] != '/') {
+ 			if (resolved_len + 1 >= PATH_MAX) {
+ 				errno = ENAMETOOLONG;
+-				return (NULL);
++				goto error_return;
+ 			}
+ 			resolved[resolved_len++] = '/';
+ 			resolved[resolved_len] = '\0';
+@@ -127,6 +208,13 @@ realpath(const char *path, char resolved
  		}
  
  		/*
@@ -91,17 +171,20 @@
  		 * Append the next path component and lstat() it. If
  		 * lstat() fails we still can return successfully if
  		 * there are no more path components left.
-@@ -136,14 +183,72 @@
+@@ -134,27 +222,89 @@ realpath(const char *path, char resolved
+ 		resolved_len = strlcat(resolved, next_token, PATH_MAX);
+ 		if (resolved_len >= PATH_MAX) {
  			errno = ENAMETOOLONG;
- 			return (NULL);
+-			return (NULL);
++			goto error_return;
  		}
 -		if (lstat(resolved, &sb) != 0) {
-+		if (getattrlist(resolved, &alist, &attrs, sizeof(attrs), FSOPT_NOFOLLOW) == 0) {
++		if (getattrlist(resolved, &_rp_alist, &attrs, sizeof(attrs), FSOPT_NOFOLLOW) == 0) {
 +			useattrs = 1;
 +			islink = (attrs.type == VLNK);
 +			dev = attrs.dev;
 +			inode = attrs.id.fid_objno;
-+		} else if (errno == EOPNOTSUPP || errno == EINVAL) {
++		} else if (errno == ENOTSUP || errno == EINVAL) {
 +			if ((useattrs = lstat(resolved, &sb)) == 0) {
 +				islink = S_ISLNK(sb.st_mode);
 +				dev = sb.st_dev;
@@ -110,11 +193,14 @@
 +		} else
 +			useattrs = -1;
 +		if (useattrs < 0) {
++#if !__DARWIN_UNIX03
  			if (errno == ENOENT && p == NULL) {
  				errno = serrno;
  				return (resolved);
  			}
- 			return (NULL);
+-			return (NULL);
++#endif /* !__DARWIN_UNIX03 */
++			goto error_return;
  		}
 -		if (S_ISLNK(sb.st_mode)) {
 +		if (dev != lastdev) {
@@ -137,7 +223,7 @@
 +				 * that each component of the mountpoint
 +				 * is a directory (and not a symlink)
 +				 */
-+				char temp[MNAMELEN];
++				char temp[sizeof(sfs.f_mntonname)];
 +				char *cp;
 +				int ok = 1;
 +
@@ -165,8 +251,16 @@
 +		if (islink) {
  			if (symlinks++ > MAXSYMLINKS) {
  				errno = ELOOP;
- 				return (NULL);
-@@ -155,6 +260,7 @@
+-				return (NULL);
++				goto error_return;
+ 			}
+ 			slen = readlink(resolved, symlink, sizeof(symlink) - 1);
+-			if (slen < 0)
+-				return (NULL);
++			if (slen < 0) {
++				goto error_return;
++			}
+ 			symlink[slen] = '\0';
  			if (symlink[0] == '/') {
  				resolved[1] = 0;
  				resolved_len = 1;
@@ -174,7 +268,21 @@
  			} else if (resolved_len > 1) {
  				/* Strip the last path component. */
  				resolved[resolved_len - 1] = '\0';
-@@ -184,7 +290,30 @@
+@@ -172,7 +322,7 @@ realpath(const char *path, char resolved
+ 				if (symlink[slen - 1] != '/') {
+ 					if (slen + 1 >= sizeof(symlink)) {
+ 						errno = ENAMETOOLONG;
+-						return (NULL);
++						goto error_return;
+ 					}
+ 					symlink[slen] = '/';
+ 					symlink[slen + 1] = 0;
+@@ -180,11 +330,34 @@ realpath(const char *path, char resolved
+ 				left_len = strlcat(symlink, left, sizeof(left));
+ 				if (left_len >= sizeof(left)) {
+ 					errno = ENAMETOOLONG;
+-					return (NULL);
++					goto error_return;
  				}
  			}
  			left_len = strlcpy(left, symlink, sizeof(left));
@@ -187,7 +295,7 @@
 +			resolved_len = strlcat(resolved, (const char *)&attrs.name + attrs.name.attr_dataoffset, PATH_MAX);
 +			if (resolved_len >= PATH_MAX) {
 +				errno = ENAMETOOLONG;
-+				return (NULL);
++				goto error_return;
 +			}
  		}
 +		/*