Libc-763.12.tar.gz

[apple/libc.git] / gen / FreeBSD / ttyname.c.patch

diff --git a/gen/FreeBSD/ttyname.c.patch b/gen/FreeBSD/ttyname.c.patch
index 4a7d2e93921d922691ce90bef3152a1fc8187bd5..7871bc346a1b92086d10fa1fa931351676c1ad9a 100644 (file)
--- a/gen/FreeBSD/ttyname.c.patch
+++ b/gen/FreeBSD/ttyname.c.patch
@@ -1,26 +1,22 @@
-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
+--- ttyname.c.orig     2010-05-01 19:18:09.000000000 -0700
++++ ttyname.c  2010-05-03 10:18:47.000000000 -0700
+@@ -48,11 +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"
  
+-static char buf[sizeof(_PATH_DEV) + MAXNAMLEN];
 +#ifndef BUILDING_VARIANT
- static char buf[sizeof(_PATH_DEV) + MAXNAMLEN];
++static pthread_once_t ttyname_buf_control = PTHREAD_ONCE_INIT;
++static char *buf = NULL;
  static char *ttyname_threaded(int fd);
  static char *ttyname_unthreaded(int fd);
-@@ -71,31 +75,54 @@ ttyname(int fd)
+ 
+@@ -71,31 +74,63 @@ ttyname(int fd)
                ret = ttyname_threaded(fd);
        return (ret);
  }
@@ -36,9 +32,9 @@ diff -u -d -b -w -p -u -r1.3 ttyname.c
  {
        struct stat     sb;
 -      char            *rval;
- 
--      rval = NULL;
 -
+-      rval = NULL;
+ 
 +#if __DARWIN_UNIX03
 +      if (_fstat(fd, &sb) < 0)
 +              return (EBADF);
@@ -47,37 +43,47 @@ diff -u -d -b -w -p -u -r1.3 ttyname.c
 -              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))
+       /* Must have enough room */
+       if (len <= sizeof(_PATH_DEV))
+-              return (rval);
 +              return (ERANGE);
 +#else /* !__DARWIN_UNIX03 */
 +      /* Must be a terminal. */
 +      if (!isatty(fd))
 +              return (NULL);
 +      /* Must be a character device. */
-       if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode))
--              return (rval);
++      if (_fstat(fd, &sb))
 +              return (NULL);
-       /* Must have enough room */
-       if (len <= sizeof(_PATH_DEV))
--              return (rval);
++      if (!S_ISCHR(sb.st_mode)) {
++              errno = ENOTTY;
++              return (NULL);
++      }
++      /* Must have enough room */
++      if (len <= sizeof(_PATH_DEV)) {
++              errno = ERANGE;
 +              return (NULL);
++      }
 +#endif /* __DARWIN_UNIX03 */
  
 -      strcpy(buf, _PATH_DEV);
 -      devname_r(sb.st_rdev, S_IFCHR,
 -          buf + strlen(buf), sizeof(buf) - strlen(buf));
 -      return (buf);
-+      strcpy(thrbuf, _PATH_DEV);
++      strlcpy(thrbuf, _PATH_DEV, len);
 +      if (devname_r(sb.st_rdev, S_IFCHR,
 +          thrbuf + strlen(thrbuf), len - strlen(thrbuf)) == NULL)
 +#if __DARWIN_UNIX03
 +              return (ERANGE);
 +      return (0);
 +#else /* !__DARWIN_UNIX03 */
++      {
++              errno = ERANGE;
 +              return (NULL);
++      }
 +      return (thrbuf);
 +#endif /* __DARWIN_UNIX03 */
  }
@@ -86,7 +92,30 @@ diff -u -d -b -w -p -u -r1.3 ttyname.c
  static char *
  ttyname_threaded(int fd)
  {
-@@ -124,7 +151,11 @@ ttyname_threaded(int fd)
+@@ -104,8 +139,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 +156,26 @@ 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 {
                        return (NULL);
                }
        }
@@ -95,18 +124,42 @@ diff -u -d -b -w -p -u -r1.3 ttyname.c
 +#else /* !__DARWIN_UNIX03 */
        return (ttyname_r(fd, buf, sizeof(_PATH_DEV) + MAXNAMLEN));
 +#endif /* __DARWIN_UNIX03 */
++}
++
++static void
++ttyname_buf_allocate(void)
++{
++      buf = malloc(sizeof(_PATH_DEV) + MAXNAMLEN);
  }
  
  static char *
-@@ -141,7 +172,9 @@ ttyname_unthreaded(int fd)
+@@ -137,11 +188,25 @@ ttyname_unthreaded(int fd)
+       if (tcgetattr(fd, &ttyb) < 0)
                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);
++      }
++
++      if (pthread_once(&ttyname_buf_control, ttyname_buf_allocate)
++              || !buf) {
++              errno = ENOMEM;
++              return (NULL);
++      }
  
-       strcpy(buf, _PATH_DEV);
+-      strcpy(buf, _PATH_DEV);
 -      devname_r(sb.st_rdev, S_IFCHR,
 -          buf + strlen(buf), sizeof(buf) - strlen(buf));
++      strlcpy(buf, _PATH_DEV, sizeof(_PATH_DEV) + MAXNAMLEN);
 +      if (devname_r(sb.st_rdev, S_IFCHR,
-+          buf + strlen(buf), sizeof(buf) - strlen(buf)) == NULL)
++              buf + strlen(buf), sizeof(_PATH_DEV) + MAXNAMLEN - strlen(buf)) == NULL) {
++              errno = ERANGE;
 +              return (NULL);
++      }
        return (buf);
  }
 +#endif /* !BUILDING_VARIANT */