X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ffork-child.c;h=e1d32b064525337fc889952e70752f66b323ff89;hb=184ad4855fc2a50df9af4ff22995c167ef98c842;hp=f3504bc640952891b78bc38da7bb8209342f5d1b;hpb=5b64ad42d36e6d487e1f7287d37fbc243a178e72;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/fork-child.c b/gdb/fork-child.c index f3504bc640..e1d32b0645 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -1,39 +1,38 @@ /* Fork a Unix child process, and set up to debug it, for GDB. - Copyright 1990, 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc. + Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, + 2001 Free Software Foundation, Inc. Contributed by Cygnus Support. -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 "gdb_string.h" #include "frame.h" /* required by inferior.h */ #include "inferior.h" #include "target.h" -#include "wait.h" +#include "gdb_wait.h" +#include "gdb_vfork.h" #include "gdbcore.h" #include "terminal.h" #include "gdbthread.h" +#include "command.h" /* for dont_repeat () */ #include -#ifdef HAVE_UNISTD_H -#include -#endif - -#define DEBUGGING 0 /* This just gets used as a default if we can't find SHELL */ #ifndef SHELL_FILE @@ -49,17 +48,10 @@ extern char **environ; * the four arguments "a", "b", "c", "d". */ static void -breakup_args ( - scratch, - argv) - char *scratch; - char **argv; +breakup_args (char *scratch, char **argv) { char *cp = scratch; -#if DEBUGGING - printf ("breakup_args: input = %s\n", scratch); -#endif for (;;) { @@ -96,23 +88,43 @@ breakup_args ( } +/* When executing a command under the given shell, return non-zero + if the '!' character should be escaped when embedded in a quoted + command-line argument. */ + +static int +escape_bang_in_quoted_argument (const char *shell_file) +{ + const int shell_file_len = strlen (shell_file); + + /* Bang should be escaped only in C Shells. For now, simply check + that the shell name ends with 'csh', which covers at least csh + and tcsh. This should be good enough for now. */ + + if (shell_file_len < 3) + return 0; + + if (shell_file[shell_file_len - 3] == 'c' + && shell_file[shell_file_len - 2] == 's' + && shell_file[shell_file_len - 1] == 'h') + return 1; -/* Start an inferior Unix child process and sets inferior_pid to its pid. + return 0; +} + +/* Start an inferior Unix child process and sets inferior_ptid to its pid. EXEC_FILE is the file to run. ALLARGS is a string containing the arguments to the program. ENV is the environment vector to pass. SHELL_FILE is the shell file, or NULL if we should pick one. Errors reported with error(). */ +/* This function is NOT-REENTRANT. Some of the variables have been + made static to ensure that they survive the vfork() call. */ + void -fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, - pre_trace_fun, shell_file) - char *exec_file; - char *allargs; - char **env; - void (*traceme_fun) PARAMS ((void)); - void (*init_trace_fun) PARAMS ((int)); - void (*pre_trace_fun) PARAMS ((void)); - char *shell_file; +fork_inferior (char *exec_file_arg, char *allargs, char **env, + void (*traceme_fun) (void), void (*init_trace_fun) (int), + void (*pre_trace_fun) (void), char *shell_file_arg) { int pid; char *shell_command; @@ -123,13 +135,15 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, /* This is set to the result of setpgrp, which if vforked, will be visible to you in the parent process. It's only used by humans for debugging. */ static int debug_setpgrp = 657473; + static char *shell_file; + static char *exec_file; char **save_our_env; int shell = 0; - char **argv; - char *tryname; + static char **argv; /* If no exec file handed to us, get it from the exec-file command -- with a good, common error message if none is specified. */ + exec_file = exec_file_arg; if (exec_file == 0) exec_file = get_exec_file (1); @@ -137,6 +151,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, * If 0, we'll just do a fork/exec, no shell, so don't * bother figuring out what shell. */ + shell_file = shell_file_arg; if (STARTUP_WITH_SHELL) { /* Figure out what shell to start up the user program under. */ @@ -147,14 +162,10 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, shell = 1; } -#if DEBUGGING - printf ("shell is %s\n", shell_file); -#endif - /* Multiplying the length of exec_file by 4 is to account for the fact that it may expand when quoted; it is a worst-case number based on every character being '. */ - len = 5 + 4 * strlen (exec_file) + 1 + strlen (allargs) + 1 + /*slop*/ 12; + len = 5 + 4 * strlen (exec_file) + 1 + strlen (allargs) + 1 + /*slop */ 12; /* If desired, concat something onto the front of ALLARGS. SHELL_COMMAND is the result. */ #ifdef SHELL_COMMAND_CONCAT @@ -169,14 +180,6 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, { /* We're going to call execvp. Create argv */ /* Largest case: every other character is a separate arg */ -#if DEBUGGING - printf ("allocating argv, length = %d\n", - ( - (strlen (allargs) + 1) / (unsigned) 2 - + 2 - ) * sizeof (*argv) - ); -#endif argv = (char **) xmalloc (((strlen (allargs) + 1) / (unsigned) 2 + 2) * sizeof (*argv)); argv[0] = exec_file; breakup_args (allargs, &argv[1]); @@ -191,18 +194,20 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, char *p; int need_to_quote; + const int escape_bang = escape_bang_in_quoted_argument (shell_file); strcat (shell_command, "exec "); /* Quoting in this style is said to work with all shells. But csh - on IRIX 4.0.1 can't deal with it. So we only quote it if we need - to. */ + on IRIX 4.0.1 can't deal with it. So we only quote it if we need + to. */ p = exec_file; while (1) { switch (*p) { case '\'': + case '!': case '"': case '(': case ')': @@ -234,6 +239,8 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, { if (*p == '\'') strcat (shell_command, "'\\''"); + else if (*p == '!' && escape_bang) + strcat (shell_command, "\\!"); else strncat (shell_command, p, 1); } @@ -268,19 +275,18 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, gdb_flush (gdb_stderr); /* If there's any initialization of the target layers that must happen - to prepare to handle the child we're about fork, do it now... + to prepare to handle the child we're about fork, do it now... */ if (pre_trace_fun != NULL) (*pre_trace_fun) (); -#if defined(USG) && !defined(HAVE_VFORK) - pid = fork (); -#else + /* Create the child process. Note that the apparent call to vfork() + below *might* actually be a call to fork() due to the fact that + autoconf will ``#define vfork fork'' on certain platforms. */ if (debug_fork) pid = fork (); else pid = vfork (); -#endif if (pid < 0) perror_with_name ("vfork"); @@ -296,15 +302,15 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, perror ("setpgrp failed in child"); /* Ask the tty subsystem to switch to the one we specified earlier - (or to share the current terminal, if none was specified). */ + (or to share the current terminal, if none was specified). */ new_tty (); /* Changing the signal handlers for the inferior after - a vfork can also change them for the superior, so we don't mess - with signals here. See comments in - initialize_signals for how we get the right signal handlers - for the inferior. */ + a vfork can also change them for the superior, so we don't mess + with signals here. See comments in + initialize_signals for how we get the right signal handlers + for the inferior. */ /* "Trace me, Dr. Memory!" */ (*traceme_fun) (); @@ -318,10 +324,10 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, */ /* There is no execlpe call, so we have to set the environment - for our child in the global variable. If we've vforked, this - clobbers the parent, but environ is restored a few lines down - in the parent. By the way, yes we do need to look down the - path to find $SHELL. Rich Pixley says so, and I agree. */ + for our child in the global variable. If we've vforked, this + clobbers the parent, but environ is restored a few lines down + in the parent. By the way, yes we do need to look down the + path to find $SHELL. Rich Pixley says so, and I agree. */ environ = env; /* If we decided above to start up with a shell, @@ -334,16 +340,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, */ if (shell) { -#if 0 - - /* HP change is problematic. The -f option has different meanings - for different shells. It is particularly inappropriate for - bourne shells. */ - execlp (shell_file, shell_file, "-f", "-c", shell_command, (char *) 0); -#else execlp (shell_file, shell_file, "-c", shell_command, (char *) 0); -#endif - /* If we get here, it's an error */ fprintf_unfiltered (gdb_stderr, "Cannot exec %s: %s.\n", shell_file, @@ -356,16 +353,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, /* Otherwise, we directly exec the target program with execvp. */ int i; char *errstring; -#if DEBUGGING - printf ("about to exec target, exec_file = %s\n", exec_file); - i = 0; - while (argv[i] != NULL) - { - printf ("strlen(argv[%d]) is %d\n", i, strlen (argv[i])); - printf ("argv[%d] is %s\n", i, argv[i]); - i++; - } -#endif + execvp (exec_file, argv); /* If we get here, it's an error */ @@ -382,8 +370,8 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, } fprintf_unfiltered (gdb_stderr, ".\n"); /* This extra info seems to be useless - fprintf_unfiltered (gdb_stderr, "Got error %s.\n", errstring); - */ + fprintf_unfiltered (gdb_stderr, "Got error %s.\n", errstring); + */ gdb_flush (gdb_stderr); _exit (0177); } @@ -394,7 +382,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, init_thread_list (); - inferior_pid = pid; /* Needed for wait_for_inferior stuff below */ + inferior_ptid = pid_to_ptid (pid); /* Needed for wait_for_inferior stuff below */ /* Now that we have a child process, make it our target, and initialize anything target-vector-specific that needs initializing. */ @@ -405,7 +393,7 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, correct program, and are poised at the first instruction of the new program. */ - /* Allow target dependant code to play with the new process. This might be + /* Allow target dependent code to play with the new process. This might be used to have target-specific code initialize a variable in the new process prior to executing the first instruction. */ TARGET_CREATE_INFERIOR_HOOK (pid); @@ -415,142 +403,10 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, #endif } -/* An inferior Unix process CHILD_PID has been created by a call to - fork() (or variants like vfork). It is presently stopped, and waiting - to be resumed. clone_and_follow_inferior will fork the debugger, - and that clone will "follow" (attach to) CHILD_PID. The original copy - of the debugger will not touch CHILD_PID again. - - Also, the original debugger will set FOLLOWED_CHILD FALSE, while the - clone will set it TRUE. - */ -void -clone_and_follow_inferior (child_pid, followed_child) - int child_pid; - int *followed_child; -{ - extern int auto_solib_add; - - int debugger_pid; - int status; - char pid_spelling[100]; /* Arbitrary but sufficient length. */ - - /* This semaphore is used to coordinate the two debuggers' handoff - of CHILD_PID. The original debugger will detach from CHILD_PID, - and then the clone debugger will attach to it. (It must be done - this way because on some targets, only one process at a time can - trace another. Thus, the original debugger must relinquish its - tracing rights before the clone can pick them up.) - */ -#define SEM_TALK (1) -#define SEM_LISTEN (0) - int handoff_semaphore[2]; /* Original "talks" to [1], clone "listens" to [0] */ - int talk_value = 99; - int listen_value; - - /* Set debug_fork then attach to the child while it sleeps, to debug. */ - static int debug_fork = 0; - - /* It is generally good practice to flush any possible pending stdio - output prior to doing a fork, to avoid the possibility of both the - parent and child flushing the same data after the fork. */ - - gdb_flush (gdb_stdout); - gdb_flush (gdb_stderr); - - /* Open the semaphore pipes. - */ - status = pipe (handoff_semaphore); - if (status < 0) - error ("error getting pipe for handoff semaphore"); - - /* Clone the debugger. */ -#if defined(USG) && !defined(HAVE_VFORK) - debugger_pid = fork (); -#else - if (debug_fork) - debugger_pid = fork (); - else - debugger_pid = vfork (); -#endif - - if (debugger_pid < 0) - perror_with_name ("fork"); - - /* Are we the original debugger? If so, we must relinquish all claims - to CHILD_PID. */ - if (debugger_pid != 0) - { - char signal_spelling[100];/* Arbitrary but sufficient length */ - - /* Detach from CHILD_PID. Deliver a "stop" signal when we do, though, - so that it remains stopped until the clone debugger can attach - to it. - */ - detach_breakpoints (child_pid); - - sprintf (signal_spelling, "%d", target_signal_to_host (TARGET_SIGNAL_STOP)); - target_require_detach (child_pid, signal_spelling, 1); - - /* Notify the clone debugger that it should attach to CHILD_PID. */ - write (handoff_semaphore[SEM_TALK], &talk_value, sizeof (talk_value)); - - *followed_child = 0; - } - - /* We're the child. */ - else - { - if (debug_fork) - sleep (debug_fork); - - /* The child (i.e., the cloned debugger) must now attach to - CHILD_PID. inferior_pid is presently set to the parent process - of the fork, while CHILD_PID should be the child process of the - fork. - - Wait until the original debugger relinquishes control of CHILD_PID, - though. - */ - read (handoff_semaphore[SEM_LISTEN], &listen_value, sizeof (listen_value)); - - /* Note that we DON'T want to actually detach from inferior_pid, - because that would allow it to run free. The original - debugger wants to retain control of the process. So, we - just reset inferior_pid to CHILD_PID, and then ensure that all - breakpoints are really set in CHILD_PID. - */ - target_mourn_inferior (); - - /* Ask the tty subsystem to switch to the one we specified earlier - (or to share the current terminal, if none was specified). */ - - new_tty (); - - dont_repeat (); - sprintf (pid_spelling, "%d", child_pid); - target_require_attach (pid_spelling, 1); - - /* Perform any necessary cleanup, after attachment. (This form - of attaching can behave differently on some targets than the - standard method, where a process formerly not under debugger - control was suddenly attached to..) - */ - target_post_follow_inferior_by_clone (); - - *followed_child = 1; - } - - /* Discard the handoff sempahore. */ - (void) close (handoff_semaphore[SEM_LISTEN]); - (void) close (handoff_semaphore[SEM_TALK]); -} - /* Accept NTRAPS traps from the inferior. */ void -startup_inferior (ntraps) - int ntraps; +startup_inferior (int ntraps) { int pending_execs = ntraps; int terminal_initted; @@ -572,12 +428,10 @@ startup_inferior (ntraps) inferior_ignoring_leading_exec_events = target_reported_exec_events_per_exec_call () - 1; -#ifdef STARTUP_INFERIOR - STARTUP_INFERIOR (pending_execs); -#else while (1) { - stop_soon_quietly = 1; /* Make wait_for_inferior be quiet */ + /* Make wait_for_inferior be quiet */ + stop_soon = STOP_QUIETLY; wait_for_inferior (); if (stop_signal != TARGET_SIGNAL_TRAP) { @@ -591,11 +445,11 @@ startup_inferior (ntraps) if (!terminal_initted) { /* Now that the child has exec'd we know it has already set its - process group. On POSIX systems, tcsetpgrp will fail with - EPERM if we try it before the child's setpgid. */ + process group. On POSIX systems, tcsetpgrp will fail with + EPERM if we try it before the child's setpgid. */ /* Set up the "saved terminal modes" of the inferior - based on what modes we are starting it with. */ + based on what modes we are starting it with. */ target_terminal_init (); /* Install inferior's terminal modes. */ @@ -611,6 +465,5 @@ startup_inferior (ntraps) resume (0, TARGET_SIGNAL_0); /* Just make it go on */ } } -#endif /* STARTUP_INFERIOR */ - stop_soon_quietly = 0; + stop_soon = NO_STOP_QUIETLY; }