about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/tcgetattr.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:14 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:14 +0000
commiteb35b0972f174cd58f118737c2935653309df7e9 (patch)
treef61603e4b104c032b3ce7b4293eb9fe38901b6ee /sysdeps/unix/sysv/linux/tcgetattr.c
parent483b8cc6cfd531611f6141b288a5e16e8010905c (diff)
downloadglibc-eb35b0972f174cd58f118737c2935653309df7e9.tar.gz
glibc-eb35b0972f174cd58f118737c2935653309df7e9.tar.xz
glibc-eb35b0972f174cd58f118737c2935653309df7e9.zip
Update.
	* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Fill in c_ispeed
	and c_ospeed fields.
	* sysdeps/unix/sysv/linux/speed.c (cfsetospeed): Set c_ospeed field.
	(cfsetispeed): Set c_ispeed field.
	* sysdeps/unix/sysv/linux/tcsetattr.c (IBAUD0): Define unconditionally
	to match corresponding speed.c code.

2003-09-06  Ulrich Drepper  <drepper@redhat.com>

	* libio/wfileops.c (_IO_wfile_underflow): Mark beginning of the
	narrow character buffer.
	* libio/Makefile: Add rules to build and run bug-ftell.
	* libio/bug-ftell.c: New file.

	* stdio-common/vfprintf.c: Don't use the first grouping number twice.

	* stdio-common/vfscanf.c (vfscanf): Fix recognition of characters
	matching the decimal point and possibly leading the thousands
	separator.  This caused the recognition of thousands separators to
	always fail.

2003-09-05  Ulrich Drepper  <drepper@redhat.com>

	* libio/fileops.c (_IO_new_file_overflow): Handle switching to
	write mode from read in backup buffer.
	* libio/Makefile (tests): Add bug-ungetc2.
	* libio/bug-ungetc2.c: New file.

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

>>>>>>> 1.7905
	* sysdeps/unix/sysv/linux/linux_fsinfo.h: Define VXFS_SUPER_MAGIC.
Diffstat (limited to 'sysdeps/unix/sysv/linux/tcgetattr.c')
-rw-r--r--sysdeps/unix/sysv/linux/tcgetattr.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/tcgetattr.c b/sysdeps/unix/sysv/linux/tcgetattr.c
index 8a6fd59cd4..25b5b51fbb 100644
--- a/sysdeps/unix/sysv/linux/tcgetattr.c
+++ b/sysdeps/unix/sysv/linux/tcgetattr.c
@@ -47,9 +47,13 @@ __tcgetattr (fd, termios_p)
   termios_p->c_line = k_termios.c_line;
 #ifdef _HAVE_C_ISPEED
   termios_p->c_ispeed = k_termios.c_ispeed;
+#else
+  termios_p->c_ispeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
 #endif
 #ifdef _HAVE_C_OSPEED
   termios_p->c_ospeed = k_termios.c_ospeed;
+#else
+  termios_p->c_ospeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
 #endif
   if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0
       || (unsigned char) _POSIX_VDISABLE == (unsigned char) -1)