From c78d192c3ac7c45e048b4e402d4a6ab513a68e45 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 28 Jan 2008 20:21:03 +0000 Subject: [PATCH] * fork-child.c (SHELL_FILE): Remove #ifndef. (fork_inferior): Remove SHELL_COMMAND_CONCAT. * gdbint.texinfo (Native Conditionals): Remove SHELL_COMMAND_CONCAT and SHELL_FILE. --- gdb/ChangeLog | 5 +++++ gdb/doc/ChangeLog | 5 +++++ gdb/doc/gdbint.texinfo | 10 ---------- gdb/fork-child.c | 9 --------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f711c0069e7..6b2fc5a35b4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2008-01-28 Daniel Jacobowitz + + * fork-child.c (SHELL_FILE): Remove #ifndef. + (fork_inferior): Remove SHELL_COMMAND_CONCAT. + 2008-01-25 Pierre Muller * i386-tdep.c (i386_skip_noop): New function. diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 37736a0adf9..40281019196 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-01-28 Daniel Jacobowitz + + * gdbint.texinfo (Native Conditionals): Remove + SHELL_COMMAND_CONCAT and SHELL_FILE. + 2008-01-23 Chris Demetriou * gdb.texinfo (Threads): Document new "set print thread-events" diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 8aa741006eb..8946d5ba11a 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -4644,16 +4644,6 @@ Defines the format for the name of a @file{/proc} device. Should be defined in @file{nm.h} @emph{only} in order to override the default definition in @file{procfs.c}. -@item SHELL_COMMAND_CONCAT -@findex SHELL_COMMAND_CONCAT -If defined, is a string to prefix on the shell command used to start the -inferior. - -@item SHELL_FILE -@findex SHELL_FILE -If defined, this is the name of the shell to use to run the inferior. -Defaults to @code{"/bin/sh"}. - @item SOLIB_ADD (@var{filename}, @var{from_tty}, @var{targ}, @var{readsyms}) @findex SOLIB_ADD Define this to expand into an expression that will cause the symbols in diff --git a/gdb/fork-child.c b/gdb/fork-child.c index 71bb28e4f80..9f0588e58ff 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -36,9 +36,7 @@ #include /* This just gets used as a default if we can't find SHELL. */ -#ifndef SHELL_FILE #define SHELL_FILE "/bin/sh" -#endif extern char **environ; @@ -162,15 +160,8 @@ fork_inferior (char *exec_file_arg, char *allargs, char **env, 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; - /* If desired, concat something onto the front of ALLARGS. - SHELL_COMMAND is the result. */ -#ifdef SHELL_COMMAND_CONCAT - shell_command = (char *) alloca (strlen (SHELL_COMMAND_CONCAT) + len); - strcpy (shell_command, SHELL_COMMAND_CONCAT); -#else shell_command = (char *) alloca (len); shell_command[0] = '\0'; -#endif if (!shell) { -- 2.30.2