|
 |
00db10 |
diff -Nru glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c
|
|
|
00db10 |
--- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c 2012-06-05 07:42:49.000000000 -0600
|
|
|
00db10 |
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/tcsetattr.c 2012-06-07 12:15:21.831318623 -0600
|
|
|
00db10 |
@@ -48,6 +48,7 @@ tcsetattr (fd, optional_actions, termios
|
|
|
00db10 |
{
|
|
|
00db10 |
struct __kernel_termios k_termios;
|
|
|
00db10 |
unsigned long int cmd;
|
|
|
00db10 |
+ int retval;
|
|
|
00db10 |
|
|
|
00db10 |
switch (optional_actions)
|
|
|
00db10 |
{
|
|
|
00db10 |
@@ -79,6 +80,35 @@ tcsetattr (fd, optional_actions, termios
|
|
|
00db10 |
memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
|
|
|
00db10 |
__KERNEL_NCCS * sizeof (cc_t));
|
|
|
00db10 |
|
|
|
00db10 |
- return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
|
|
|
00db10 |
+ retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
|
|
|
00db10 |
+
|
|
|
00db10 |
+ if (retval == 0 && cmd == TCSETS)
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ /* The Linux kernel has a bug which silently ignore the invalid
|
|
|
00db10 |
+ c_cflag on pty. We have to check it here. */
|
|
|
00db10 |
+ int save = errno;
|
|
|
00db10 |
+ retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
|
|
|
00db10 |
+ if (retval)
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ /* We cannot verify if the setting is ok. We don't return
|
|
|
00db10 |
+ an error (?). */
|
|
|
00db10 |
+ __set_errno (save);
|
|
|
00db10 |
+ retval = 0;
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ else if ((termios_p->c_cflag & (PARENB | CREAD))
|
|
|
00db10 |
+ != (k_termios.c_cflag & (PARENB | CREAD))
|
|
|
00db10 |
+ || ((termios_p->c_cflag & CSIZE)
|
|
|
00db10 |
+ && ((termios_p->c_cflag & CSIZE)
|
|
|
00db10 |
+ != (k_termios.c_cflag & CSIZE))))
|
|
|
00db10 |
+ {
|
|
|
00db10 |
+ /* It looks like the Linux kernel silently changed the
|
|
|
00db10 |
+ PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
|
|
|
00db10 |
+ error. */
|
|
|
00db10 |
+ __set_errno (EINVAL);
|
|
|
00db10 |
+ retval = -1;
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+ }
|
|
|
00db10 |
+
|
|
|
00db10 |
+ return retval;
|
|
|
00db10 |
}
|
|
|
00db10 |
libc_hidden_def (tcsetattr)
|