From 8c4796197c60fc8aa380d8995f0d744faf4d8c4a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 17 Dec 1998 20:59:54 +0000 Subject: Update. * iconv/gconv_int.h (gconv_module): Add new element from_regex_mem. * iconv/gconv_conf.c (module_compare): Make s1 and s2 const. (detect_conflict): New function. (add_alias): Call detect_conflict to see whether there is already a module for the new name. (add_module): Make sure there is no alias for the new name. (read_conf_file): Call add_alias with new argument. (__gconv_read_conf): Don't destroy module tree immediately after walking it. We need it to test the internal conversions for conflicts. * iconv/gconv_db.c (find_derivation): Don't allocate memory for regular expression. There is now room in the module descriptor. (free_mem): Don't free memory for regular expression. --- sysdeps/unix/sysv/linux/tcsetattr.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c index b919dbe1c4..4a352372c9 100644 --- a/sysdeps/unix/sysv/linux/tcsetattr.c +++ b/sysdeps/unix/sysv/linux/tcsetattr.c @@ -73,9 +73,7 @@ tcsetattr (fd, optional_actions, termios_p) return -1; } - termios_p->c_iflag &= ~IBAUD0; - - k_termios.c_iflag = termios_p->c_iflag; + k_termios.c_iflag = termios_p->c_iflag & ~IBAUD0; k_termios.c_oflag = termios_p->c_oflag; k_termios.c_cflag = termios_p->c_cflag; k_termios.c_lflag = termios_p->c_lflag; -- cgit 1.4.1