Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Unify shell-finding logic

Browse Source 
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.
This commit is contained in:
Tom Tromey
2018-09-14 10:35:45 -06:00
parent c8ee3f04a6
commit 974e684463
7 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/cli/cli-cmds.c
View File

@@ -50,6 +50,7 @@
#include "cli/cli-utils.h"
#include "extension.h"
#include "common/pathstuff.h"
#ifdef TUI
#include "tui/tui.h" /* For tui_active et.al. */
@@ -726,13 +727,10 @@ shell_escape (const char *arg, int from_tty)
if ((pid = vfork ()) == 0)
{
const char *p, *user_shell;
const char *p, *user_shell = get_shell ();
close_most_fds ();
if ((user_shell = getenv ("SHELL")) == NULL)
user_shell = "/bin/sh";
/* Get the name of the shell for arg0. */
p = lbasename (user_shell);