[PATCH 1/4] Move scoped_ignore_sigttou to gdbsupport/
Pedro Alves
pedro@palves.net
Tue Jun 15 11:14:26 GMT 2021
A following patch will want to use scoped_ignore_sigttou in code
shared between GDB and GDBserver. Move it under gdbsupport/.
Note that despite what inflow.h/inflow.c's first line says, inflow.c
is no longer about ptrace, it is about terminal management. Some
other files were unnecessarily including inflow.h, I guess a leftover
from the days when inflow.c really was about ptrace. Those inclusions
are simply dropped.
gdb/ChangeLog:
yyyy-mm-dd Pedro Alves <pedro@palves.net>
* Makefile.in (HFILES_NO_SRCDIR): Remove inflow.h.
* inf-ptrace.c, inflow.c, procfs.c: Don't include "inflow.h".
* inflow.h: Delete, moved to gdbsupport/ under a different name.
* ser-unix.c: Don't include "inflow.h". Include
"gdbsupport/scoped_ignore_sigttou.h".
gdbsupport/ChangeLog:
yyyy-mm-dd Pedro Alves <pedro@palves.net>
* scoped_ignore_sigttou.h: New file, moved from gdb/ and renamed.
Change-Id: Ie390abf42c3a78bec6d282ad2a63edd3e623559a
---
gdb/Makefile.in | 1 -
gdb/inf-ptrace.c | 1 -
gdb/inflow.c | 2 +-
gdb/procfs.c | 1 -
gdb/ser-unix.c | 2 +-
gdb/inflow.h => gdbsupport/scoped_ignore_sigttou.h | 8 ++++----
6 files changed, 6 insertions(+), 9 deletions(-)
rename gdb/inflow.h => gdbsupport/scoped_ignore_sigttou.h (90%)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b3d264f267c..881ebde8fb0 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1336,7 +1336,6 @@ HFILES_NO_SRCDIR = \
inf-ptrace.h \
infcall.h \
inferior.h \
- inflow.h \
inline-frame.h \
interps.h \
jit.h \
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index b6fa71fd2c0..afa38de6ef7 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -20,7 +20,6 @@
#include "defs.h"
#include "command.h"
#include "inferior.h"
-#include "inflow.h"
#include "terminal.h"
#include "gdbcore.h"
#include "regcache.h"
diff --git a/gdb/inflow.c b/gdb/inflow.c
index d241540c4cd..f9917d6a81c 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -29,12 +29,12 @@
#include <fcntl.h>
#include "gdbsupport/gdb_select.h"
-#include "inflow.h"
#include "gdbcmd.h"
#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
#include "gdbsupport/job-control.h"
+#include "gdbsupport/scoped_ignore_sigttou.h"
#ifdef HAVE_SYS_IOCTL_H
#include <sys/ioctl.h>
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 23c0aa22a7a..529ee33df90 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -40,7 +40,6 @@
#include <signal.h>
#include <ctype.h>
#include "gdb_bfd.h"
-#include "inflow.h"
#include "auxv.h"
#include "procfs.h"
#include "observable.h"
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index e97dc2f925d..96d024eea3d 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -32,7 +32,7 @@
#include "gdbcmd.h"
#include "gdbsupport/filestuff.h"
#include <termios.h>
-#include "inflow.h"
+#include "gdbsupport/scoped_ignore_sigttou.h"
struct hardwire_ttystate
{
diff --git a/gdb/inflow.h b/gdbsupport/scoped_ignore_sigttou.h
similarity index 90%
rename from gdb/inflow.h
rename to gdbsupport/scoped_ignore_sigttou.h
index 8a671c7c4c7..a31316460b4 100644
--- a/gdb/inflow.h
+++ b/gdbsupport/scoped_ignore_sigttou.h
@@ -1,4 +1,4 @@
-/* Low level interface to ptrace, for GDB when running under Unix.
+/* Support for signoring SIGTTOU.
Copyright (C) 2003-2021 Free Software Foundation, Inc.
@@ -17,8 +17,8 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifndef INFLOW_H
-#define INFLOW_H
+#ifndef SCOPED_IGNORE_SIGTTOU_H
+#define SCOPED_IGNORE_SIGTTOU_H
#include <unistd.h>
#include <signal.h>
@@ -53,4 +53,4 @@ class scoped_ignore_sigttou
#endif
};
-#endif /* inflow.h */
+#endif /* SCOPED_IGNORE_SIGTTOU_H */
--
2.26.2
More information about the Gdb-patches
mailing list