From 08f74b9271bc22a0e0a55707f18b23778d25be1e Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Sat, 22 Jan 1994 17:36:41 +0000 Subject: * fork-child.c, inferior.h (fork_inferior): New argument shell_file. * procfs.c (procfs_create_inferior), inftarg.c (child_create_inferior), m3-nat.c (m3_create_inferior): Pass it. * procfs.c: Remove ptrace function. It was declared in a way which conflicted with the prototype in unistd.h on Solaris. --- gdb/fork-child.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'gdb/fork-child.c') diff --git a/gdb/fork-child.c b/gdb/fork-child.c index f4a5a59e060..4fd5ee35748 100644 --- a/gdb/fork-child.c +++ b/gdb/fork-child.c @@ -38,26 +38,28 @@ extern int original_stack_limit; extern char **environ; -/* Start an inferior Unix child process and sets inferior_pid 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. Errors reported with error(). */ - #ifndef SHELL_FILE #define SHELL_FILE "/bin/sh" #endif +/* Start an inferior Unix child process and sets inferior_pid 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(). */ + void -fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun) +fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun, + shell_file) char *exec_file; char *allargs; char **env; void (*traceme_fun) PARAMS ((void)); void (*init_trace_fun) PARAMS ((int)); + char *shell_file; { int pid; char *shell_command; - char *shell_file; static char default_shell_file[] = SHELL_FILE; int len; /* Set debug_fork then attach to the child while it sleeps, to debug. */ @@ -76,8 +78,10 @@ fork_inferior (exec_file, allargs, env, traceme_fun, init_trace_fun) the program to behave the same way as if run from his/her favorite shell. So we let the shell run it for us. FIXME-maybe, we might want a "set shell" command so the user can change - the shell from within GDB. */ - shell_file = getenv ("SHELL"); + the shell from within GDB (if so, change callers which pass in a non-NULL + shell_file too). */ + if (shell_file == NULL) + shell_file = getenv ("SHELL"); if (shell_file == NULL) shell_file = default_shell_file; -- cgit v1.2.1