about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-11-15 20:31:32 +0100
committerFlorian Weimer <fweimer@redhat.com>2017-12-22 15:23:41 +0100
commit1f0ba053ed6d065b2261f49d77bdcf4a34255689 (patch)
treef4be15ae2cf15aca28d11fe0f3dc44233bb29789
parent58a63062a04c05a0e0633e0cdbf315a57cc88b5d (diff)
downloadglibc-1f0ba053ed6d065b2261f49d77bdcf4a34255689.tar.gz
glibc-1f0ba053ed6d065b2261f49d77bdcf4a34255689.tar.xz
glibc-1f0ba053ed6d065b2261f49d77bdcf4a34255689.zip
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>
(cherry picked from commit 9b5a87502d048905c383b65c51768f4a1db8c685)
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/ttyname.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 56b25337fb..1fb584ae20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-11-15  Luke Shumaker  <lukeshu@parabola.nu>
 
+	* sysdeps/unix/sysv/linux/ttyname.h (is_pty): Update doc reference.
+
+2017-11-15  Luke Shumaker  <lukeshu@parabola.nu>
+
 	* 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)
 {