summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-11-15 20:31:32 +0100
committerChristian Brauner <christian.brauner@ubuntu.com>2017-11-15 20:46:56 +0100
commit9b5a87502d048905c383b65c51768f4a1db8c685 (patch)
treee1a3b82f9ed9aa354acd141305a62fa7b1909eef
parent495a56fdeb05d20a88304ff5da577d23a8e81ae1 (diff)
downloadglibc-9b5a87502d048905c383b65c51768f4a1db8c685.tar.gz
linux ttyname: Update a reference to kernel docs for kernel 4.10
Linux 4.10 moved many of the documentation files around. 4.10 came out between the time the patch adding the comment (commit 15e9a4f378c8607c2ae1aa465436af4321db0e23) was submitted and the time it was applied (in February, January, and March 2017; respectively). Reviewed-by: Christian Brauner <christian.brauner@ubuntu.com>
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/ttyname.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7916ad639f..6194237230 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2017-11-15 Luke Shumaker <lukeshu@parabola.nu>
+ * sysdeps/unix/sysv/linux/ttyname.h (is_pty): Update doc reference.
+
* manual/terminal.texi (Is It a Terminal):
Mention ENODEV for ttyname and ttyname_r.
diff --git a/sysdeps/unix/sysv/linux/ttyname.h b/sysdeps/unix/sysv/linux/ttyname.h
index 2e415e4e9c..cbcdbab607 100644
--- a/sysdeps/unix/sysv/linux/ttyname.h
+++ b/sysdeps/unix/sysv/linux/ttyname.h
@@ -21,7 +21,8 @@
#include <sys/stat.h>
/* Return true if this is a UNIX98 pty device, as defined in
- linux/Documentation/devices.txt. */
+ linux/Documentation/devices.txt (on linux < 4.10) or
+ linux/Documentation/admin-guide/devices.txt (on linux >= 4.10). */
static inline int
is_pty (struct stat64 *sb)
{