From 1c8e01c96054973c50ec1dec2f220af4734e1de5 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Fri, 16 Jun 2017 18:10:27 -0400 Subject: [PATCH] Use getenv instead of gdb_environ on mi-cmd-env.c This is a spinoff of . mi-cmd-env.c is using the whole gdb_environ machinery in order to access just one variable, which can be easily replaced by a simple call to getenv. This patch does that, and doesn't cause regressions. gdb/ChangeLog: 2017-06-18 Sergio Durigan Junior * mi/mi-cm-env.c (_initialize_mi_cmd_env): Use getenv instead of gdb_environ to access an environment variable. --- gdb/ChangeLog | 5 +++++ gdb/mi/mi-cmd-env.c | 12 ++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1bbcb711b0..aaf4b891ae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-06-19 Sergio Durigan Junior + + * mi/mi-cm-env.c (_initialize_mi_cmd_env): Use getenv instead of + gdb_environ to access an environment variable. + 2017-06-18 Thomas Petazzoni * nat/linux-ptrace.c (linux_fork_to_function): Add cast to diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c index 4093178713..97be139afd 100644 --- a/gdb/mi/mi-cmd-env.c +++ b/gdb/mi/mi-cmd-env.c @@ -270,21 +270,17 @@ mi_cmd_inferior_tty_show (const char *command, char **argv, int argc) void _initialize_mi_cmd_env (void) { - struct gdb_environ *environment; const char *env; /* We want original execution path to reset to, if desired later. At this point, current inferior is not created, so cannot use - current_inferior ()->environment. Also, there's no obvious - place where this code can be moved such that it surely run - before any code possibly mangles original PATH. */ - environment = make_environ (); - init_environ (environment); - env = get_in_environ (environment, path_var_name); + current_inferior ()->environment. We use getenv here because it + is not necessary to create a whole new gdb_environ just for one + variable. */ + env = getenv (path_var_name); /* Can be null if path is not set. */ if (!env) env = ""; orig_path = xstrdup (env); - free_environ (environment); } -- 2.34.1