Message ID | 20171102185346.1386-3-lukeshu@parabola.nu |
---|---|
State | New |
Headers | show |
Series | Fixup linux ttyname and ttyname_r [BZ #22145] | expand |
On Thu, Nov 02, 2017 at 02:53:43PM -0400, Luke Shumaker wrote: > Linux 4.10 moved many of the documentation files around. > > It came out between the time the patch adding the comment (commit > 15e9a4f3) was submitted and the time it was applied (in February, > January, and March 2017; respectively). > --- > ChangeLog | 2 ++ > sysdeps/unix/sysv/linux/ttyname.h | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) Reviewed-By: Christian Brauner <christian.brauner@ubuntu.com> > > diff --git a/ChangeLog b/ChangeLog > index f6137669bf..2c7770fbbb 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,5 +1,7 @@ > 2017-11-02 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..dd7873d1ff 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) > { > -- > 2.15.0 >
On Thu, Nov 02, 2017 at 02:53:43PM -0400, Luke Shumaker wrote: > Linux 4.10 moved many of the documentation files around. > > It came out between the time the patch adding the comment (commit > 15e9a4f3) was submitted and the time it was applied (in February, > January, and March 2017; respectively). s/15e9a4f3/15e9a4f378c8607c2ae1aa465436af4321db0e23/ s/;/,/ The change is OK. Reviewed-by: Dmitry V. Levin <ldv@altlinux.org>
On Mon, Nov 06, 2017 at 07:15:31PM +0300, Dmitry V. Levin wrote: > On Thu, Nov 02, 2017 at 02:53:43PM -0400, Luke Shumaker wrote: > > Linux 4.10 moved many of the documentation files around. > > > > It came out between the time the patch adding the comment (commit > > 15e9a4f3) was submitted and the time it was applied (in February, > > January, and March 2017; respectively). > > s/15e9a4f3/15e9a4f378c8607c2ae1aa465436af4321db0e23/ > s/;/,/ > > The change is OK. > > Reviewed-by: Dmitry V. Levin <ldv@altlinux.org> I'm going to change the wording in some of the commit messages anyway so I would just do this substitution when I apply, i.e. if people are fine with that. > > > -- > ldv
On Thu, 02 Nov 2017 14:53:43 -0400, Luke Shumaker wrote: > --- 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). */ Style: two spaces after period.
diff --git a/ChangeLog b/ChangeLog index f6137669bf..2c7770fbbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2017-11-02 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..dd7873d1ff 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) {