X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fser-pipe.c;h=db4c8e0e1a4c280c28ff3743556da34c9811e8bf;hb=bc10778499a971ab9ccecb074cc406d49e1ee608;hp=053dcead1e1d898568b1c7d6ba3482575903a88e;hpb=9b254dd1ce46c19dde1dde5b8d1e22e862dfacce;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c index 053dcead1e..db4c8e0e1a 100644 --- a/gdb/ser-pipe.c +++ b/gdb/ser-pipe.c @@ -1,5 +1,5 @@ /* Serial interface for a pipe to a separate program - Copyright (C) 1999, 2000, 2001, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1999-2020 Free Software Foundation, Inc. Contributed by Cygnus Solutions. @@ -27,23 +27,21 @@ #include #include -#include +#include "gdbsupport/gdb_sys_time.h" #include -#include "gdb_string.h" +#include "gdbsupport/filestuff.h" #include static int pipe_open (struct serial *scb, const char *name); static void pipe_close (struct serial *scb); -extern void _initialize_ser_pipe (void); - struct pipe_state { int pid; }; -/* Open up a raw pipe */ +/* Open up a raw pipe. */ static int pipe_open (struct serial *scb, const char *name) @@ -62,10 +60,15 @@ pipe_open (struct serial *scb, const char *name) int pdes[2]; int err_pdes[2]; int pid; - if (socketpair (AF_UNIX, SOCK_STREAM, 0, pdes) < 0) - return -1; - if (socketpair (AF_UNIX, SOCK_STREAM, 0, err_pdes) < 0) + + if (gdb_socketpair_cloexec (AF_UNIX, SOCK_STREAM, 0, pdes) < 0) return -1; + if (gdb_socketpair_cloexec (AF_UNIX, SOCK_STREAM, 0, err_pdes) < 0) + { + close (pdes[0]); + close (pdes[1]); + return -1; + } /* Create the child process to run the command in. Note that the apparent call to vfork() below *might* actually be a call to @@ -73,7 +76,7 @@ pipe_open (struct serial *scb, const char *name) on certain platforms. */ pid = vfork (); - /* Error. */ + /* Error. */ if (pid == -1) { close (pdes[0]); @@ -90,10 +93,19 @@ pipe_open (struct serial *scb, const char *name) err_pdes[0] = err_pdes[1] = -1; } - /* Child. */ + /* Child. */ if (pid == 0) { - /* re-wire pdes[1] to stdin/stdout */ + /* We don't want ^c to kill the connection. */ +#ifdef HAVE_SETSID + pid_t sid = setsid (); + if (sid == -1) + signal (SIGINT, SIG_IGN); +#else + signal (SIGINT, SIG_IGN); +#endif + + /* Re-wire pdes[1] to stdin/stdout. */ close (pdes[0]); if (pdes[1] != STDOUT_FILENO) { @@ -108,22 +120,18 @@ pipe_open (struct serial *scb, const char *name) dup2 (err_pdes[1], STDERR_FILENO); close (err_pdes[1]); } -#if 0 - /* close any stray FD's - FIXME - how? */ - /* POSIX.2 B.3.2.2 "popen() shall ensure that any streams - from previous popen() calls that remain open in the - parent process are closed in the new child process. */ - for (old = pidlist; old; old = old->next) - close (fileno (old->fp)); /* don't allow a flush */ -#endif + + close_most_fds (); execl ("/bin/sh", "sh", "-c", name, (char *) 0); _exit (127); } - /* Parent. */ + /* Parent. */ close (pdes[1]); + if (err_pdes[1] != -1) + close (err_pdes[1]); /* :end chunk */ - state = XMALLOC (struct pipe_state); + state = XNEW (struct pipe_state); state->pid = pid; scb->fd = pdes[0]; scb->error_fd = err_pdes[0]; @@ -138,45 +146,91 @@ pipe_open (struct serial *scb, const char *name) static void pipe_close (struct serial *scb) { - struct pipe_state *state = scb->state; + struct pipe_state *state = (struct pipe_state *) scb->state; + + close (scb->fd); + scb->fd = -1; + if (state != NULL) { - int pid = state->pid; - close (scb->fd); - scb->fd = -1; + int wait_result, status; + + /* Don't kill the task right away, give it a chance to shut down cleanly. + But don't wait forever though. */ +#define PIPE_CLOSE_TIMEOUT 5 + + /* Assume the program will exit after SIGTERM. Might be + useful to print any remaining stderr output from + scb->error_fd while waiting. */ +#define SIGTERM_TIMEOUT INT_MAX + + wait_result = -1; +#ifdef HAVE_WAITPID + wait_result = wait_to_die_with_timeout (state->pid, &status, + PIPE_CLOSE_TIMEOUT); +#endif + if (wait_result == -1) + { + kill (state->pid, SIGTERM); +#ifdef HAVE_WAITPID + wait_to_die_with_timeout (state->pid, &status, SIGTERM_TIMEOUT); +#endif + } + + if (scb->error_fd != -1) + close (scb->error_fd); + scb->error_fd = -1; xfree (state); scb->state = NULL; - kill (pid, SIGTERM); - /* Might be useful to check that the child does die. */ } } -static struct serial_ops pipe_ops; +int +gdb_pipe (int pdes[2]) +{ +#if !HAVE_SOCKETPAIR + errno = ENOSYS; + return -1; +#else + if (gdb_socketpair_cloexec (AF_UNIX, SOCK_STREAM, 0, pdes) < 0) + return -1; + + /* If we don't do this, GDB simply exits when the remote side + dies. */ + signal (SIGPIPE, SIG_IGN); + return 0; +#endif +} + +static const struct serial_ops pipe_ops = +{ + "pipe", + pipe_open, + pipe_close, + NULL, + ser_base_readchar, + ser_base_write, + ser_base_flush_output, + ser_base_flush_input, + ser_base_send_break, + ser_base_raw, + ser_base_get_tty_state, + ser_base_copy_tty_state, + ser_base_set_tty_state, + ser_base_print_tty_state, + ser_base_setbaudrate, + ser_base_setstopbits, + ser_base_setparity, + ser_base_drain_output, + ser_base_async, + ser_unix_read_prim, + ser_unix_write_prim +}; + +void _initialize_ser_pipe (); void -_initialize_ser_pipe (void) +_initialize_ser_pipe () { - struct serial_ops *ops = XMALLOC (struct serial_ops); - memset (ops, 0, sizeof (struct serial_ops)); - ops->name = "pipe"; - ops->next = 0; - ops->open = pipe_open; - ops->close = pipe_close; - ops->readchar = ser_base_readchar; - ops->write = ser_base_write; - ops->flush_output = ser_base_flush_output; - ops->flush_input = ser_base_flush_input; - ops->send_break = ser_base_send_break; - ops->go_raw = ser_base_raw; - ops->get_tty_state = ser_base_get_tty_state; - ops->set_tty_state = ser_base_set_tty_state; - ops->print_tty_state = ser_base_print_tty_state; - ops->noflush_set_tty_state = ser_base_noflush_set_tty_state; - ops->setbaudrate = ser_base_setbaudrate; - ops->setstopbits = ser_base_setstopbits; - ops->drain_output = ser_base_drain_output; - ops->async = ser_base_async; - ops->read_prim = ser_unix_read_prim; - ops->write_prim = ser_unix_write_prim; - serial_add_interface (ops); + serial_add_interface (&pipe_ops); }