Fold Linux-specific grantpt code into Unix version.

3 files changed, 25 insertions, 91 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ccf028..60f7b5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/grantpt.c: Remove file after folding changes
+	into ...
+	* sysdeps/unix/grantpt.c: ...here.
+
 2009-06-15  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/grantpt.c (grantpt): Only call chown and
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index bdedbac..ff28179 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2001, 2002, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
 
@@ -115,8 +115,24 @@ grantpt (int fd)
   gid_t gid;
   pid_t pid;
 
-  if (pts_name (fd, &buf, sizeof (_buf)))
-    return -1;
+  if (__builtin_expect (pts_name (fd, &buf, sizeof (_buf)), 0))
+    {
+      int save_errno = errno;
+
+      /* Check, if the file descriptor is valid.  pts_name returns the
+	 wrong errno number, so we cannot use that.  */
+      if (__libc_fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+	return -1;
+
+       /* If the filedescriptor is no TTY, grantpt has to set errno
+          to EINVAL.  */
+       if (save_errno == ENOTTY)
+         __set_errno (EINVAL);
+       else
+	 __set_errno (save_errno);
+
+       return -1;
+    }
 
   if (__xstat64 (_STAT_VER, buf, &st) < 0)
     goto cleanup;
diff --git a/sysdeps/unix/sysv/linux/grantpt.c b/sysdeps/unix/sysv/linux/grantpt.c
deleted file mode 100644
index c858f89..0000000
--- a/sysdeps/unix/sysv/linux/grantpt.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (C) 1998, 1999, 2001, 2002, 2009 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/statfs.h>
-
-#include "linux_fsinfo.h"
-
-/* Prototype for function that changes ownership and access permission
-   for slave pseudo terminals that do not live on a `devpts'
-   filesystem.  */
-static int __unix_grantpt (int fd);
-
-/* Prototype for private function that gets the name of the slave
-   pseudo terminal in a safe way.  */
-static int pts_name (int fd, char **pts, size_t buf_len);
-
-/* Change the ownership and access permission of the slave pseudo
-   terminal associated with the master pseudo terminal specified
-   by FD.  */
-int
-grantpt (int fd)
-{
-  struct statfs fsbuf;
-#ifdef PATH_MAX
-  char _buf[PATH_MAX];
-#else
-  char _buf[512];
-#endif
-  char *buf = _buf;
-
-  if (__builtin_expect (pts_name (fd, &buf, sizeof (_buf)), 0))
-    {
-      int save_errno = errno;
-
-      /* Check, if the file descriptor is valid. pts_name returns the
-	 wrong errno number, so we cannot use that.  */
-      if (__libc_fcntl (fd, F_GETFD) == -1 && errno == EBADF)
-	return -1;
-
-       /* If the filedescriptor is no TTY, grantpt has to set errno
-          to EINVAL.  */
-       if (save_errno == ENOTTY)
-         __set_errno (EINVAL);
-       else
-	 __set_errno (save_errno);
-
-       return -1;
-    }
-
-  if (__statfs (buf, &fsbuf) < 0)
-    return -1;
-
-  /* If the slave pseudo terminal lives on a `devpts' filesystem, the
-     ownership is already set and the access permission might already
-     be set.  */
-  if (fsbuf.f_type == DEVPTS_SUPER_MAGIC || fsbuf.f_type == DEVFS_SUPER_MAGIC)
-    {
-      struct stat64 st;
-
-      if (fstat (fd, &st) == 0
-	  && (st.st_mode & ACCESSPERMS) == (S_IRUSR|S_IWUSR|S_IWGRP))
-	return 0;
-    }
-
-  return __unix_grantpt (fd);
-}
-
-#define grantpt static __unix_grantpt
-#include <sysdeps/unix/grantpt.c>