lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Remove termios2 ioctl defintions from public headers

Browse Source 
The use of the termios2 ioctl interface is an implementation detail which
should not bleed into public headers.  Remove the PowerPC version of
<bits/ioctls.h> and define the termios2 ioctl numbers in <termios_arch.h>
instead.  Also remove the include check from there which is unneeded in an
internal header.
This commit is contained in:
Andreas Schwab
2025-07-10 09:19:38 +02:00
parent c559a6190e
commit d6c2760ef7
2 changed files with 12 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sysdeps/unix/sysv/linux/powerpc/bits/ioctls.h
View File

@ -1,36 +0,0 @@
/* Copyright (C) 1996-2025 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
<https://www.gnu.org/licenses/>. */
#ifndef _SYS_IOCTL_H
# error "Never use <bits/ioctls.h> directly; include <sys/ioctl.h> instead."
#endif
/* Use the definitions from the kernel header files. */
#include <asm/ioctls.h>
/* PowerPC quirk: on PowerPC only, ioctl() emulates the TCGETS/TCSETS*
ioctls with tcgetattr/tcsetattr using the glibc struct termios.
As struct termios2 is the same as the kernel struct termios on PowerPC,
simply consider the kernel ones as the termios2 interface, even
though the kernel doesn't call it that. */
#define TCGETS2 _IOR ('t', 19, struct termios2)
#define TCSETS2 _IOW ('t', 20, struct termios2)
#define TCSETSW2 _IOW ('t', 21, struct termios2)
#define TCSETSF2 _IOW ('t', 22, struct termios2)
#include <linux/sockios.h>

17
sysdeps/unix/sysv/linux/powerpc/termios_arch.h
View File

@ -1,4 +1,4 @@
/* Architectural parameters for Linux termios - Alpha/PowerPC version
/* Architectural parameters for Linux termios - PowerPC version
Copyright (C) 1997-2025 Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -17,10 +17,17 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#ifndef TERMIOS_INTERNALS_H
# error "<termios_arch.h> should only be included from <termios_internals.h>"
#endif
#define _TERMIOS2_NCCS 19
#define _HAVE_TERMIOS2_C_CC_BEFORE_C_LINE 1
#define _HAVE_STRUCT_OLD_TERMIOS 0
/* PowerPC quirk: on PowerPC only, ioctl() emulates the TCGETS/TCSETS*
ioctls with tcgetattr/tcsetattr using the glibc struct termios.
As struct termios2 is the same as the kernel struct termios on PowerPC,
simply consider the kernel ones as the termios2 interface, even
though the kernel doesn't call it that. */
#define TCGETS2 _IOR ('t', 19, struct termios2)
#define TCSETS2 _IOW ('t', 20, struct termios2)
#define TCSETSW2 _IOW ('t', 21, struct termios2)
#define TCSETSF2 _IOW ('t', 22, struct termios2)