lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Only store

Browse Source 
results if the call was succesful.
This commit is contained in:
Ulrich Drepper
2006-05-10 19:32:07 +00:00
parent d6c159fe15
commit 0088b04eeb
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2006-05-10 Ulrich Drepper <drepper@redhat.com> 2006-05-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Only store
results if the call was succesful.
* nis/nss-nis.h: Mark __yperr2nss_tab and __yperr2nss_count as hidden. * nis/nss-nis.h: Mark __yperr2nss_tab and __yperr2nss_count as hidden.
* nis/nss-nisplus.h: Mark __niserr2nss_tab and __niserr2nss_count * nis/nss-nisplus.h: Mark __niserr2nss_tab and __niserr2nss_count

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

@ -1,4 +1,4 @@
/* Copyright (C) 1992, 1995, 1997, 1998, 2003 Free Software Foundation, Inc. /* Copyright (C) 1992,1995,1997,1998,2003,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -40,39 +40,40 @@ __tcgetattr (fd, termios_p)
retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios); retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
termios_p->c_iflag = k_termios.c_iflag; if (__builtin_expect (retval == 0, 1))
termios_p->c_oflag = k_termios.c_oflag; {
termios_p->c_cflag = k_termios.c_cflag; termios_p->c_iflag = k_termios.c_iflag;
termios_p->c_lflag = k_termios.c_lflag; termios_p->c_oflag = k_termios.c_oflag;
termios_p->c_line = k_termios.c_line; 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_STRUCT_TERMIOS_C_ISPEED #ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
# ifdef _HAVE_C_ISPEED # ifdef _HAVE_C_ISPEED
termios_p->c_ispeed = k_termios.c_ispeed; termios_p->c_ispeed = k_termios.c_ispeed;
# else # else
termios_p->c_ispeed = k_termios.c_cflag & (CBAUD | CBAUDEX); termios_p->c_ispeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
# endif # endif
#endif #endif
#ifdef _HAVE_STRUCT_TERMIOS_C_OSPEED #ifdef _HAVE_STRUCT_TERMIOS_C_OSPEED
# ifdef _HAVE_C_OSPEED # ifdef _HAVE_C_OSPEED
termios_p->c_ospeed = k_termios.c_ospeed; termios_p->c_ospeed = k_termios.c_ospeed;
# else # else
termios_p->c_ospeed = k_termios.c_cflag & (CBAUD | CBAUDEX); termios_p->c_ospeed = k_termios.c_cflag & (CBAUD | CBAUDEX);
# endif # endif
#endif #endif
if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0 if (sizeof (cc_t) == 1 || _POSIX_VDISABLE == 0
|| (unsigned char) _POSIX_VDISABLE == (unsigned char) -1) || (unsigned char) _POSIX_VDISABLE == (unsigned char) -1)
memset (__mempcpy (&termios_p->c_cc[0], &k_termios.c_cc[0], memset (__mempcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
__KERNEL_NCCS * sizeof (cc_t)), __KERNEL_NCCS * sizeof (cc_t)),
_POSIX_VDISABLE, (NCCS - __KERNEL_NCCS) * sizeof (cc_t)); _POSIX_VDISABLE, (NCCS - __KERNEL_NCCS) * sizeof (cc_t));
else else
{ {
size_t cnt; memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0],
__KERNEL_NCCS * sizeof (cc_t));
memcpy (&termios_p->c_cc[0], &k_termios.c_cc[0], for (size_t cnt = __KERNEL_NCCS; cnt < NCCS; ++cnt)
__KERNEL_NCCS * sizeof (cc_t)); termios_p->c_cc[cnt] = _POSIX_VDISABLE;
}
for (cnt = __KERNEL_NCCS; cnt < NCCS; ++cnt)
termios_p->c_cc[cnt] = _POSIX_VDISABLE;
} }
return retval; return retval;