This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.11-54-ge2c59de
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 26 Nov 2009 16:49:44 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.11-54-ge2c59de
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via e2c59de609151c643be697fd243ffe0b92753f43 (commit)
from c53f6228f178f54d8a93569b88c1c3144c8a9d3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e2c59de609151c643be697fd243ffe0b92753f43
commit e2c59de609151c643be697fd243ffe0b92753f43
Author: Ulrich Drepper <drepper@redhat.com>
Date: Thu Nov 26 08:47:56 2009 -0800
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 000a535..1b487ec 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 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))
{
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/unix/sysv/linux/ptsname.c | 2 ++
2 files changed, 8 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources