aboutsummaryrefslogtreecommitdiff
path: root/gdb/procfs.c
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-09-14 10:35:45 -0600
committerTom Tromey <tom@tromey.com>2018-10-27 11:58:40 -0600
commit974e68446388769f023c6c9bfb1e67ed75199618 (patch)
tree49cb772e05b3d9157addbfea699624a0f293e969 /gdb/procfs.c
parentc8ee3f04a66141d5fa930cd77bc53ac0bc17de32 (diff)
downloadgdb-974e68446388769f023c6c9bfb1e67ed75199618.zip
gdb-974e68446388769f023c6c9bfb1e67ed75199618.tar.gz
gdb-974e68446388769f023c6c9bfb1e67ed75199618.tar.bz2
Unify shell-finding logic
I noticed several places in gdb that were using getenv("SHELL") and then falling back to "/bin/sh" if it returned NULL. This unifies these into a single function. gdb/ChangeLog 2018-10-27 Tom Tromey <tom@tromey.com> * procfs.c (procfs_target::create_inferior): Use get_shell. * cli/cli-cmds.c (shell_escape): Use get_shell. * windows-nat.c (windows_nat_target::create_inferior): Use get_shell. * common/pathstuff.c (get_shell): New function. * nat/fork-inferior.c (SHELL_FILE, get_startup_shell): Remove. (fork_inferior): Use get_shell. * common/pathstuff.h (get_shell): Declare.
Diffstat (limited to 'gdb/procfs.c')
-rw-r--r--gdb/procfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 6ffe569..ca381a7 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -3035,11 +3035,11 @@ procfs_target::create_inferior (const char *exec_file,
const std::string &allargs,
char **env, int from_tty)
{
- char *shell_file = getenv ("SHELL");
+ const char *shell_file = get_shell ();
char *tryname;
int pid;
- if (shell_file != NULL && strchr (shell_file, '/') == NULL)
+ if (strchr (shell_file, '/') == NULL)
{
/* We will be looking down the PATH to find shell_file. If we