--- Libc/Libc-583/gen/FreeBSD/ttyname.c.patch
+++ Libc/Libc-391.4.2/gen/FreeBSD/ttyname.c.patch
@@ -1,10 +1,17 @@
---- ttyname.c.orig	2008-10-09 21:30:31.000000000 -0700
-+++ ttyname.c	2008-10-09 22:00:10.000000000 -0700
-@@ -48,10 +48,12 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/tty
+Index: ttyname.c
+===================================================================
+RCS file: /cvs/root/Libc/gen/FreeBSD/ttyname.c,v
+retrieving revision 1.3
+diff -u -d -b -w -p -u -r1.3 ttyname.c
+--- ttyname.c	2004/11/25 19:38:02	1.3
++++ ttyname.c	2004/12/12 03:51:44
+@@ -48,10 +48,14 @@ __FBSDID("$FreeBSD: src/lib/libc/gen/tty
  #include <string.h>
  #include <paths.h>
  #include <pthread.h>
++#if __DARWIN_UNIX03
 +#include <errno.h>
++#endif /* __DARWIN_UNIX03 */
  #include "un-namespace.h"
  
  #include "libc_private.h"
@@ -13,7 +20,7 @@
  static char buf[sizeof(_PATH_DEV) + MAXNAMLEN];
  static char *ttyname_threaded(int fd);
  static char *ttyname_unthreaded(int fd);
-@@ -71,31 +73,63 @@ ttyname(int fd)
+@@ -71,31 +75,54 @@ ttyname(int fd)
  		ret = ttyname_threaded(fd);
  	return (ret);
  }
@@ -29,9 +36,9 @@
  {
  	struct stat	sb;
 -	char		*rval;
+ 
+-	rval = NULL;
 -
--	rval = NULL;
- 
 +#if __DARWIN_UNIX03
 +	if (_fstat(fd, &sb) < 0)
 +		return (EBADF);
@@ -40,30 +47,23 @@
 -		return (rval);
 +		return (ENOTTY);
  	/* Must be a character device. */
--	if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode))
--		return (rval);
 +	if (!S_ISCHR(sb.st_mode))
 +		return (ENOTTY);
- 	/* Must have enough room */
- 	if (len <= sizeof(_PATH_DEV))
--		return (rval);
++	/* Must have enough room */
++	if (len <= sizeof(_PATH_DEV))
 +		return (ERANGE);
 +#else /* !__DARWIN_UNIX03 */
 +	/* Must be a terminal. */
 +	if (!isatty(fd))
 +		return (NULL);
 +	/* Must be a character device. */
-+	if (_fstat(fd, &sb))
+ 	if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode))
+-		return (rval);
 +		return (NULL);
-+	if (!S_ISCHR(sb.st_mode)) {
-+		errno = ENOTTY;
+ 	/* Must have enough room */
+ 	if (len <= sizeof(_PATH_DEV))
+-		return (rval);
 +		return (NULL);
-+	}
-+	/* Must have enough room */
-+	if (len <= sizeof(_PATH_DEV)) {
-+		errno = ERANGE;
-+		return (NULL);
-+	}
 +#endif /* __DARWIN_UNIX03 */
  
 -	strcpy(buf, _PATH_DEV);
@@ -77,10 +77,7 @@
 +		return (ERANGE);
 +	return (0);
 +#else /* !__DARWIN_UNIX03 */
-+	{
-+		errno = ERANGE;
 +		return (NULL);
-+	}
 +	return (thrbuf);
 +#endif /* __DARWIN_UNIX03 */
  }
@@ -89,30 +86,7 @@
  static char *
  ttyname_threaded(int fd)
  {
-@@ -104,8 +138,12 @@ ttyname_threaded(int fd)
- 	if (ttyname_init == 0) {
- 		_pthread_mutex_lock(&ttyname_lock);
- 		if (ttyname_init == 0) {
--			if (_pthread_key_create(&ttyname_key, free)) {
-+			/* __PTK_LIBC_TTYNAME_KEY */
-+			ttyname_key = __LIBC_PTHREAD_KEY_TTYNAME;
-+			if (pthread_key_init_np(ttyname_key, free)) {
-+				int save = errno;
- 				_pthread_mutex_unlock(&ttyname_lock);
-+				errno = save;
- 				return (NULL);
- 			}
- 			ttyname_init = 1;
-@@ -117,14 +155,20 @@ ttyname_threaded(int fd)
- 	if ((buf = _pthread_getspecific(ttyname_key)) == NULL) {
- 		if ((buf = malloc(sizeof(_PATH_DEV) + MAXNAMLEN)) != NULL) {
- 			if (_pthread_setspecific(ttyname_key, buf) != 0) {
-+				int save = errno;
- 				free(buf);
-+				errno = save;
- 				return (NULL);
- 			}
- 		} else {
+@@ -124,7 +151,11 @@ ttyname_threaded(int fd)
  			return (NULL);
  		}
  	}
@@ -124,26 +98,15 @@
  }
  
  static char *
-@@ -137,11 +181,19 @@ ttyname_unthreaded(int fd)
- 	if (tcgetattr(fd, &ttyb) < 0)
+@@ -141,7 +172,9 @@ ttyname_unthreaded(int fd)
  		return (NULL);
- 	/* Must be a character device. */
--	if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode))
-+	if (_fstat(fd, &sb))
- 		return (NULL);
-+	if (!S_ISCHR(sb.st_mode)) {
-+		errno = ENOTTY;
-+		return (NULL);
-+	}
  
  	strcpy(buf, _PATH_DEV);
 -	devname_r(sb.st_rdev, S_IFCHR,
 -	    buf + strlen(buf), sizeof(buf) - strlen(buf));
 +	if (devname_r(sb.st_rdev, S_IFCHR,
-+	    buf + strlen(buf), sizeof(buf) - strlen(buf)) == NULL) {
-+		errno = ERANGE;
++	    buf + strlen(buf), sizeof(buf) - strlen(buf)) == NULL)
 +		return (NULL);
-+	}
  	return (buf);
  }
 +#endif /* !BUILDING_VARIANT */