From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 26 Nov 2009 16:47:56 +0000 (-0800)
Subject: Avoid handling long-obsolete old BSD PTY handling in ptsname.
X-Git-Tag: fedora/glibc-2.11.90-3~1^2~1
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=e2c59de609151c643be697fd243ffe0b92753f43;p=glibc.git

Avoid handling long-obsolete old BSD PTY handling in ptsname.

Support for this type of PTY was removed in the 2.1.115 kernel.  Just
use __LINUX_KERNEL_VERSION to determine when we can drop the compat code.
---

diff --git a/ChangeLog b/ChangeLog
index 000a535f1d..1b487ec264 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/ptsname.c (__ptsname_internal): Avoid code
+	only used on truly ancient kernel if configuration requires a more
+	recent kernel.
+
 2009-11-24  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #3662]
diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
index ba7c791c9f..129d09085e 100644
--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@@ -128,10 +128,12 @@ __ptsname_internal (int fd, char *buf, size_t buflen, struct stat64 *stp)
 	}
 
       ptyno = minor (stp->st_rdev);
+#if __LINUX_KERNEL_VERSION >= 131443
       /* This is for the old BSD pseudo terminals.  As of Linux
 	 2.1.115 these are no longer supported.  */
       if (major (stp->st_rdev) == 4)
 	ptyno -= 128;
+#endif
 
       if (ptyno / 16 >= strlen (__libc_ptyname1))
 	{