From: jtc Date: Tue, 6 Feb 2001 04:17:02 +0000 (+0000) Subject: * signals.h: Removed. X-Git-Tag: pre-posix-scan~1002 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f62e9f8a3bd56289693f566de91a7e9ddcfc9249;p=pf3gnuchains%2Fpf3gnuchains4x.git * signals.h: Removed. * event-top.c (#include ): Changed from signals.h. * inflow.c: Likewise. * mac-xdep.c: Likewise. * ser-pipe.c: Likewise. * ser-tcp.c: Likewise. * standalone.c: Likewise. * top.c: Likewise. * utils.c: Likewise. * Makefile.in: Removed signals.h from dependencies. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7f9bfe29e6..4dc7bd687c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2001-02-05 J.T. Conklin + + * signals.h: Removed. + * event-top.c (#include ): Changed from signals.h. + * inflow.c: Likewise. + * mac-xdep.c: Likewise. + * ser-pipe.c: Likewise. + * ser-tcp.c: Likewise. + * standalone.c: Likewise. + * top.c: Likewise. + * utils.c: Likewise. + * Makefile.in: Removed signals.h from dependencies. + 2001-02-05 Christopher Faylor Change suggested by Dean Luick diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 549f86bf11..ac10c0b763 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -616,7 +616,7 @@ cli_utils_h = $(srcdir)/cli/cli-utils.h HFILES_NO_SRCDIR = bcache.h buildsym.h call-cmds.h coff-solib.h defs.h \ dst.h environ.h $(gdbcmd_h) gdbcore.h \ gdb-stabs.h hpread.h $(inferior_h) language.h minimon.h monitor.h \ - objfiles.h parser-defs.h partial-stab.h serial.h signals.h solib.h \ + objfiles.h parser-defs.h partial-stab.h serial.h solib.h \ symfile.h stabsread.h target.h terminal.h typeprint.h xcoffsolib.h \ c-lang.h ch-lang.h f-lang.h \ jv-lang.h \ @@ -1519,7 +1519,7 @@ infcmd.o: infcmd.c $(defs_h) environ.h $(gdbcmd_h) $(gdbcore_h) \ $(inferior_h) target.h language.h symfile.h gdb_string.h inflow.o: inflow.c $(bfd_h) $(command_h) $(defs_h) $(inferior_h) \ - signals.h target.h terminal.h gdbthread.h gdb_string.h + target.h terminal.h gdbthread.h gdb_string.h infptrace.o: infptrace.c $(defs_h) $(gdbcore_h) $(inferior_h) target.h \ gdb_string.h gdb_wait.h $(command_h) @@ -1862,13 +1862,13 @@ scm-valprint.o: $(defs_h) $(value_h) parser-defs.h language.h \ ser-go32.o: ser-go32.c $(defs_h) serial.h -ser-mac.o: ser-mac.c $(defs_h) serial.h signals.h +ser-mac.o: ser-mac.c $(defs_h) serial.h -ser-ocd.o: ser-ocd.c $(defs_h) serial.h signals.h gdb_string.h +ser-ocd.o: ser-ocd.c $(defs_h) serial.h gdb_string.h -ser-pipe.o: ser-pipe.c $(defs_h) serial.h signals.h gdb_string.h ser-unix.h +ser-pipe.o: ser-pipe.c $(defs_h) serial.h gdb_string.h ser-unix.h -ser-tcp.o: ser-tcp.c $(defs_h) serial.h signals.h gdb_string.h ser-unix.h +ser-tcp.o: ser-tcp.c $(defs_h) serial.h gdb_string.h ser-unix.h ser-unix.o: ser-unix.c $(defs_h) serial.h ser-unix.h @@ -1962,7 +1962,7 @@ completer.o: completer.c completer.h $(gdbtypes_h) $(symtab_h) \ $(defs_h) $(gdbcmd_h) $(expression_h) $(readline_headers) top.o: top.c top.h $(bfd_h) $(getopt_h) $(readline_headers) call-cmds.h \ - $(defs_h) $(gdbcmd_h) $(inferior_h) language.h signals.h \ + $(defs_h) $(gdbcmd_h) $(inferior_h) language.h \ $(remote_utils_h) gdb_string.h $(event_loop_h) $(event_top_h) \ completer.h $(version_h) @@ -1977,7 +1977,7 @@ ultra3-xdep.o: ultra3-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) umax-xdep.o: umax-xdep.c $(defs_h) $(gdbcore_h) $(inferior_h) utils.o: utils.c $(bfd_h) $(defs_h) $(expression_h) $(gdbcmd_h) \ - language.h signals.h target.h terminal.h $(readline_headers) \ + language.h target.h terminal.h $(readline_headers) \ gdb_string.h $(event_loop_h) $(event_top_h) valarith.o: valarith.c $(bfd_h) $(defs_h) $(expression_h) \ diff --git a/gdb/event-top.c b/gdb/event-top.c index e2c511c1a8..2aa8731d4d 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -24,9 +24,9 @@ #include "inferior.h" #include "target.h" #include "terminal.h" /* for job_control */ -#include "signals.h" #include "event-loop.h" #include "event-top.h" +#include /* For dont_repeat() */ #include "gdbcmd.h" diff --git a/gdb/inflow.c b/gdb/inflow.c index 17bce7fd0f..4f751e8bed 100644 --- a/gdb/inflow.c +++ b/gdb/inflow.c @@ -22,7 +22,6 @@ #include "frame.h" #include "inferior.h" #include "command.h" -#include "signals.h" #include "serial.h" #include "terminal.h" #include "target.h" diff --git a/gdb/mac-xdep.c b/gdb/mac-xdep.c index 019c8ba455..856591a949 100644 --- a/gdb/mac-xdep.c +++ b/gdb/mac-xdep.c @@ -72,7 +72,7 @@ #include "call-cmds.h" #include "symtab.h" #include "inferior.h" -#include "signals.h" +#include #include "target.h" #include "breakpoint.h" #include "gdbtypes.h" diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c index 96e1556e8c..6690941165 100644 --- a/gdb/ser-pipe.c +++ b/gdb/ser-pipe.c @@ -32,7 +32,7 @@ #include #include "gdb_string.h" -#include "signals.h" +#include static int pipe_open (serial_t scb, const char *name); static void pipe_close (serial_t scb); diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c index c55133760f..06635ee840 100644 --- a/gdb/ser-tcp.c +++ b/gdb/ser-tcp.c @@ -1,67 +1,49 @@ /* Serial interface for raw TCP connections on Un*x like systems - Copyright 1992, 1993, 1998 Free Software Foundation, Inc. + Copyright 1992, 1993, 1998-1999 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program 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 General Public License for more details. + This program 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 General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "serial.h" +#include "ser-unix.h" + #include #include #include #include #include #include - #ifndef __CYGWIN32__ #include #endif -#include "signals.h" +#include #include "gdb_string.h" -struct tcp_ttystate -{ - int bogus; -}; - -static int tcp_open PARAMS ((serial_t scb, const char *name)); -static void tcp_raw PARAMS ((serial_t scb)); -static int wait_for PARAMS ((serial_t scb, int timeout)); -static int tcp_readchar PARAMS ((serial_t scb, int timeout)); -static int tcp_setbaudrate PARAMS ((serial_t scb, int rate)); -static int tcp_setstopbits PARAMS ((serial_t scb, int num)); -static int tcp_write PARAMS ((serial_t scb, const char *str, int len)); -/* FIXME: static void tcp_restore PARAMS ((serial_t scb)); */ -static void tcp_close PARAMS ((serial_t scb)); -static serial_ttystate tcp_get_tty_state PARAMS ((serial_t scb)); -static int tcp_set_tty_state PARAMS ((serial_t scb, serial_ttystate state)); -static int tcp_return_0 PARAMS ((serial_t)); -static int tcp_noflush_set_tty_state PARAMS ((serial_t, serial_ttystate, - serial_ttystate)); -static void tcp_print_tty_state PARAMS ((serial_t, serial_ttystate)); - -void _initialize_ser_tcp PARAMS ((void)); +static int tcp_open (serial_t scb, const char *name); +static void tcp_close (serial_t scb); + +void _initialize_ser_tcp (void); /* Open up a raw tcp socket */ static int -tcp_open(scb, name) - serial_t scb; - const char *name; +tcp_open (serial_t scb, const char *name) { char *port_str; int port; @@ -75,10 +57,10 @@ tcp_open(scb, name) port_str = strchr (name, ':'); if (!port_str) - error ("tcp_open: No colon in host name!"); /* Shouldn't ever happen */ + error ("tcp_open: No colon in host name!"); /* Shouldn't ever happen */ tmp = min (port_str - name, (int) sizeof hostname - 1); - strncpy (hostname, name, tmp); /* Don't want colon */ + strncpy (hostname, name, tmp); /* Don't want colon */ hostname[tmp] = '\000'; /* Tie off host name */ port = atoi (port_str + 1); @@ -99,18 +81,18 @@ tcp_open(scb, name) /* Allow rapid reuse of this port. */ tmp = 1; - setsockopt (scb->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&tmp, sizeof(tmp)); + setsockopt (scb->fd, SOL_SOCKET, SO_REUSEADDR, (char *) &tmp, sizeof (tmp)); /* Enable TCP keep alive process. */ tmp = 1; - setsockopt (scb->fd, SOL_SOCKET, SO_KEEPALIVE, (char *)&tmp, sizeof(tmp)); + setsockopt (scb->fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &tmp, sizeof (tmp)); sockaddr.sin_family = PF_INET; - sockaddr.sin_port = htons(port); + sockaddr.sin_port = htons (port); memcpy (&sockaddr.sin_addr.s_addr, hostent->h_addr, sizeof (struct in_addr)); - if (!connect (scb->fd, (struct sockaddr *) &sockaddr, sizeof(sockaddr))) + if (!connect (scb->fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr))) break; close (scb->fd); @@ -131,228 +113,47 @@ tcp_open(scb, name) tmp = 1; if (setsockopt (scb->fd, protoent->p_proto, TCP_NODELAY, - (char *)&tmp, sizeof(tmp))) + (char *) &tmp, sizeof (tmp))) return -1; - signal(SIGPIPE, SIG_IGN); /* If we don't do this, then GDB simply exits + signal (SIGPIPE, SIG_IGN); /* If we don't do this, then GDB simply exits when the remote side dies. */ return 0; } -static serial_ttystate -tcp_get_tty_state(scb) - serial_t scb; -{ - struct tcp_ttystate *state; - - state = (struct tcp_ttystate *)xmalloc(sizeof *state); - - return (serial_ttystate)state; -} - -static int -tcp_set_tty_state(scb, ttystate) - serial_t scb; - serial_ttystate ttystate; -{ - struct tcp_ttystate *state; - - state = (struct tcp_ttystate *)ttystate; - - return 0; -} - -static int -tcp_return_0 (scb) - serial_t scb; -{ - return 0; -} - -static void -tcp_raw(scb) - serial_t scb; -{ - return; /* Always in raw mode */ -} - -/* Wait for input on scb, with timeout seconds. Returns 0 on success, - otherwise SERIAL_TIMEOUT or SERIAL_ERROR. - - For termio{s}, we actually just setup VTIME if necessary, and let the - timeout occur in the read() in tcp_read(). - */ - -static int -wait_for (scb, timeout) - serial_t scb; - int timeout; -{ - int numfds; - struct timeval tv; - fd_set readfds, exceptfds; - - FD_ZERO (&readfds); - FD_ZERO (&exceptfds); - - tv.tv_sec = timeout; - tv.tv_usec = 0; - - FD_SET(scb->fd, &readfds); - FD_SET(scb->fd, &exceptfds); - - while (1) - { - if (timeout >= 0) - numfds = select(scb->fd+1, &readfds, 0, &exceptfds, &tv); - else - numfds = select(scb->fd+1, &readfds, 0, &exceptfds, 0); - - if (numfds <= 0) - { - if (numfds == 0) - return SERIAL_TIMEOUT; - else if (errno == EINTR) - continue; - else - return SERIAL_ERROR; /* Got an error from select or poll */ - } - - return 0; - } -} - -/* Read a character with user-specified timeout. TIMEOUT is number of seconds - to wait, or -1 to wait forever. Use timeout of 0 to effect a poll. Returns - char if successful. Returns -2 if timeout expired, EOF if line dropped - dead, or -3 for any other error (see errno in that case). */ - -static int -tcp_readchar (scb, timeout) - serial_t scb; - int timeout; -{ - int status; - - if (scb->bufcnt-- > 0) - return *scb->bufp++; - - status = wait_for(scb, timeout); - - if (status < 0) - return status; - - while (1) - { - scb->bufcnt = read(scb->fd, scb->buf, BUFSIZ); - if (scb->bufcnt != -1 || errno != EINTR) - break; - } - - if (scb->bufcnt <= 0) - { - if (scb->bufcnt == 0) - return SERIAL_TIMEOUT; /* 0 chars means timeout [may need to - distinguish between EOF & timeouts - someday] */ - else - return SERIAL_ERROR; /* Got an error from read */ - } - - scb->bufcnt--; - scb->bufp = scb->buf; - return *scb->bufp++; -} - -static int -tcp_noflush_set_tty_state (scb, new_ttystate, old_ttystate) - serial_t scb; - serial_ttystate new_ttystate; - serial_ttystate old_ttystate; -{ - return 0; -} - static void -tcp_print_tty_state (scb, ttystate) - serial_t scb; - serial_ttystate ttystate; -{ - /* Nothing to print. */ - return; -} - -static int -tcp_setbaudrate(scb, rate) - serial_t scb; - int rate; -{ - return 0; /* Never fails! */ -} - -static int -tcp_setstopbits(scb, num) - serial_t scb; - int num; -{ - return 0; /* Never fails! */ -} - -static int -tcp_write(scb, str, len) - serial_t scb; - const char *str; - int len; -{ - int cc; - - while (len > 0) - { - cc = write(scb->fd, str, len); - - if (cc < 0) - return 1; - len -= cc; - str += cc; - } - return 0; -} - -static void -tcp_close(scb) - serial_t scb; +tcp_close (serial_t scb) { if (scb->fd < 0) return; - close(scb->fd); + close (scb->fd); scb->fd = -1; } -static struct serial_ops tcp_ops = -{ - "tcp", - 0, - tcp_open, - tcp_close, - tcp_readchar, - tcp_write, - tcp_return_0, /* flush output */ - tcp_return_0, /* flush input */ - tcp_return_0, /* send break */ - tcp_raw, - tcp_get_tty_state, - tcp_set_tty_state, - tcp_print_tty_state, - tcp_noflush_set_tty_state, - tcp_setbaudrate, - tcp_setstopbits, - tcp_return_0, /* wait for output to drain */ -}; - void -_initialize_ser_tcp () -{ - serial_add_interface (&tcp_ops); +_initialize_ser_tcp (void) +{ + struct serial_ops *ops = XMALLOC (struct serial_ops); + memset (ops, sizeof (struct serial_ops), 0); + ops->name = "tcp"; + ops->next = 0; + ops->open = tcp_open; + ops->close = tcp_close; + ops->readchar = ser_unix_readchar; + ops->write = ser_unix_write; + ops->flush_output = ser_unix_nop_flush_output; + ops->flush_input = ser_unix_flush_input; + ops->send_break = ser_unix_nop_send_break; + ops->go_raw = ser_unix_nop_raw; + ops->get_tty_state = ser_unix_nop_get_tty_state; + ops->set_tty_state = ser_unix_nop_set_tty_state; + ops->print_tty_state = ser_unix_nop_print_tty_state; + ops->noflush_set_tty_state = ser_unix_nop_noflush_set_tty_state; + ops->setbaudrate = ser_unix_nop_setbaudrate; + ops->setstopbits = ser_unix_nop_setstopbits; + ops->drain_output = ser_unix_nop_drain_output; + ops->async = ser_unix_async; + serial_add_interface (ops); } diff --git a/gdb/signals.h b/gdb/signals.h deleted file mode 100644 index a1348b6373..0000000000 --- a/gdb/signals.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Signal handler definitions for GDB, the GNU Debugger. - Copyright (C) 1986, 1989 Free Software Foundation, Inc. - -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program 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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - - -/* This file is almost the same as including except that it - eliminates certain signal names when job control is not supported, - (or, on some systems, when job control is there but doesn't work - the way GDB expects it to work). */ -/* This has been superceded by the job_control variable in serial.h. */ - -#include diff --git a/gdb/standalone.c b/gdb/standalone.c index 07e062d7d7..64f25bf1c1 100644 --- a/gdb/standalone.c +++ b/gdb/standalone.c @@ -30,7 +30,7 @@ #endif /* SIGTSTP and SIGIO defined (must be 4.2) */ #include "defs.h" -#include "signals.h" +#include #include "symtab.h" #include "frame.h" #include "inferior.h" diff --git a/gdb/top.c b/gdb/top.c index cb1b0edb0d..4c4603ab94 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -23,7 +23,7 @@ #include "call-cmds.h" #include "symtab.h" #include "inferior.h" -#include "signals.h" +#include #include "target.h" #include "breakpoint.h" #include "gdbtypes.h" diff --git a/gdb/utils.c b/gdb/utils.c index 98bee73e08..0d89cb7b56 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -40,7 +40,7 @@ #undef reg #endif -#include "signals.h" +#include #include "gdbcmd.h" #include "serial.h" #include "bfd.h"