OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2003-09-10 Roland McGrath <roland@redhat.com>

Browse Source 
* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr):
	Don't use c_ispeed under [! _HAVE_STRUCT_TERMIOS_C_ISPEED].
	Don't use c_ospeed under [! _HAVE_STRUCT_TERMIOS_C_OSPEED].
	* sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Likewise.
	Reported by Daniel Jacobowitz  <drow@mvista.com>.
This commit is contained in:
Roland McGrath 2003-09-10 19:16:07 +00:00
parent cd94eda99b
commit e99e03878b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysdeps/unix/sysv/linux/tcgetattr.c
View File

@ -45,15 +45,19 @@ __tcgetattr (fd, termios_p)
termios_p->c_cflag = k_termios.c_cflag;
termios_p->c_lflag = k_termios.c_lflag;
termios_p->c_line = k_termios.c_line;
#ifdef _HAVE_C_ISPEED
#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
# ifdef _HAVE_C_ISPEED
termios_p->c_ispeed = k_termios.c_ispeed;
#else
# else
termios_p->c_ispeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
# endif
#endif
#ifdef _HAVE_C_OSPEED
#ifdef _HAVE_STRUCT_TERMIOS_C_OSPEED
# ifdef _HAVE_C_OSPEED
termios_p->c_ospeed = k_termios.c_ospeed;
#else
# else
termios_p->c_ospeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
# endif
#endif
if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0
|| (unsigned char) _POSIX_VDISABLE == (unsigned char) -1)

4
sysdeps/unix/sysv/linux/tcsetattr.c
View File

@ -71,10 +71,10 @@ tcsetattr (fd, optional_actions, termios_p)
k_termios.c_cflag = termios_p->c_cflag;
k_termios.c_lflag = termios_p->c_lflag;
k_termios.c_line = termios_p->c_line;
#ifdef _HAVE_C_ISPEED
#if defined _HAVE_C_ISPEED && defined _HAVE_STRUCT_TERMIOS_C_ISPEED
k_termios.c_ispeed = termios_p->c_ispeed;
#endif
#ifdef _HAVE_C_OSPEED
#if defined _HAVE_C_OSPEED && defined _HAVE_STRUCT_TERMIOS_C_OSPEED
k_termios.c_ospeed = termios_p->c_ospeed;
#endif
memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],