From e2c59de609151c643be697fd243ffe0b92753f43 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 26 Nov 2009 08:47:56 -0800 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/ptsname.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 000a535..1b487ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-26 Ulrich Drepper + + * 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 [BZ #3662] diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c index ba7c791..129d090 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)) { -- 2.7.4