diff options
author | Joseph Myers <joseph@codesourcery.com> | 2013-12-22 14:49:48 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2013-12-22 14:49:48 +0000 |
commit | ef7344f09c5ce00eb519ed14598b2a8e39c68387 (patch) | |
tree | 63a43c8439d000adbaa463c32a669f01faab9d3c /sysdeps/unix/bsd/bsd4.4/tcsetattr.c | |
parent | 5b0626b9c50e69fe4d7dce90199d78f398c249b1 (diff) | |
download | glibc-ef7344f09c5ce00eb519ed14598b2a8e39c68387.tar.gz glibc-ef7344f09c5ce00eb519ed14598b2a8e39c68387.tar.xz glibc-ef7344f09c5ce00eb519ed14598b2a8e39c68387.zip |
Flatten sysdeps/unix/bsd/bsd4.4 into sysdeps/unix/bsd.
As discussed in <https://sourceware.org/ml/libc-alpha/2012-04/msg00840.html> and <https://sourceware.org/ml/libc-alpha/2012-04/msg00989.html>, it seems appropriate to flatten sysdeps/unix/bsd/bsd4.4 into sysdeps/unix/bsd. The bulk of the patch is just moving files. The only other changes are: update paths in sysdeps/mach/hurd/Implies and sysdeps/unix/sysv/linux/wait3.c; merge the two syscalls.list files, with the removal of syscalls that were in sysdeps/unix/bsd/syscalls.list but overridden in the bsd4.4 directory by .c files there. Tested x86_64. The installed shared libraries are identical before and after the patch except for libc.so where the move of wait3.c (included by sysdeps/unix/sysv/linux/wait3.c) affects debug info, but the disassembly is unchanged. * sysdeps/mach/hurd/Implies: Change unix/bsd/bsd4.4 to unix/bsd. * sysdeps/unix/bsd/syscalls.list (chflags): Add entry from sysdeps/unix/bsd/bsd4.4/syscalls.list. (fchflags): Likewise. (revoke): Likewise. (setlogin): Likewise. (sigaltstack): Likewise. (wait4): Likewise. (sigblock): Remove. (sigsetmask): Likewise. (wait3): Likewise. (waitpid): Likewise. * sysdeps/unix/bsd/bsd4.4/syscalls.list: Remove file. * sysdeps/unix/sysv/linux/wait3.c: Update directory of included file. * sysdeps/unix/bsd/bsd4.4/Makefile: Move to ... * sysdeps/unix/bsd/Makefile: ... here. * sysdeps/unix/bsd/bsd4.4/Versions: Move to ... * sysdeps/unix/bsd/Versions: ... here. * sysdeps/unix/bsd/bsd4.4/bits/sockaddr.h: Move to ... * sysdeps/unix/bsd/bits/sockaddr.h: ... here. * sysdeps/unix/bsd/bsd4.4/cmsg_nxthdr.c: Move to ... * sysdeps/unix/bsd/cmsg_nxthdr.c: ... here. * sysdeps/unix/bsd/bsd4.4/sigblock.c: Move to ... * sysdeps/unix/bsd/sigblock.c: ... here. * sysdeps/unix/bsd/bsd4.4/sigsetmask.c: Move to ... * sysdeps/unix/bsd/sigsetmask.c: ... here. * sysdeps/unix/bsd/bsd4.4/sigvec.c: Move to ... * sysdeps/unix/bsd/sigvec.c: ... here. * sysdeps/unix/bsd/bsd4.4/tcdrain.c: Move to ... * sysdeps/unix/bsd/tcdrain.c: ... here. * sysdeps/unix/bsd/bsd4.4/tcgetattr.c: Move to ... * sysdeps/unix/bsd/tcgetattr.c: ... here. * sysdeps/unix/bsd/bsd4.4/tcsetattr.c: Move to ... * sysdeps/unix/bsd/tcsetattr.c: ... here. * sysdeps/unix/bsd/bsd4.4/wait.c: Move to ... * sysdeps/unix/bsd/wait.c: ... here. * sysdeps/unix/bsd/bsd4.4/wait3.c: Move to ... * sysdeps/unix/bsd/wait3.c: ... here. * sysdeps/unix/bsd/bsd4.4/waitpid.c: Move to ... * sysdeps/unix/bsd/waitpid.c: ... here.
Diffstat (limited to 'sysdeps/unix/bsd/bsd4.4/tcsetattr.c')
-rw-r--r-- | sysdeps/unix/bsd/bsd4.4/tcsetattr.c | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/sysdeps/unix/bsd/bsd4.4/tcsetattr.c b/sysdeps/unix/bsd/bsd4.4/tcsetattr.c deleted file mode 100644 index bd58771549..0000000000 --- a/sysdeps/unix/bsd/bsd4.4/tcsetattr.c +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright (C) 1992-2013 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <errno.h> -#include <stddef.h> -#include <termios.h> - -/* These are defined both in <bits/termios.h> and in <bits/ioctls.h>. - They should have the same values, but perhaps not written the same way. */ -#undef ECHO -#undef MDMBUF -#undef TOSTOP -#undef FLUSHO -#undef PENDIN -#undef NOFLSH -#include <sys/ioctl.h> - - -/* Set the state of FD to *TERMIOS_P. */ -int -tcsetattr (fd, optional_actions, termios_p) - int fd; - int optional_actions; - const struct termios *termios_p; -{ - struct termios myt; - - if (optional_actions & TCSASOFT) - { - myt = *termios_p; - myt.c_cflag |= CIGNORE; - termios_p = &myt; - optional_actions &= ~TCSASOFT; - } - - switch (optional_actions) - { - case TCSANOW: - return __ioctl (fd, TIOCSETA, termios_p); - - case TCSADRAIN: - return __ioctl (fd, TIOCSETAW, termios_p); - - default: - return __ioctl (fd, TIOCSETAF, termios_p); - } -} -libc_hidden_def (tcsetattr) |