3f81c18a86
* infcmd.c (inferior_args): Rename to ... (inferior_args_scratch): ... this. (inferior_io_terminal): Rename to ... (inferior_io_terminal_scratch): ... this. (inferior_argc, inferior_argv): Remove. (set_inferior_io_terminal, get_inferior_io_terminal): Store inside current_inferior(). (set_inferior_tty_command, show_inferior_tty_command): New. (get_inferior_args, set_inferior_args): Store inside current_inferior(). (notice_args_set): Likewise and rename to... (set_args_command): ... this. (set_inferior_args_vector): Likewise. (notice_args_read): Rename to... (show_args_command): ...new. (tty_command): Remove. (run_command_1): Don't free old args, as they are freed by set_inferior_arg now. (run_no_args_command): Likewise. (inferior_environ): Remove. (run_command_1): Use environment of the current inferior. (environment_info, set_environment_command) (unset_environment_command, path_info, path_command): Likewise. (_initialize_infcmd): Adjust for function and variable renames. Do not init inferior_environ. * inferior.h (set_inferior_arg): Adjust prototype. (struct inferior): New fields args, argc, argv, terminal, environment. (inferior_environ): Remove declaration. * inferior.c (free_inferior): Free new fields. (add_inferior_silent): Initialize 'environment' field. * main.c (captured_main): Set arguments only after the initial inferior has been created. Set set_inferior_io_terminal, not tty_command. * mi/mi-main.c (mi_cmd_env_path): Use environment of the current inferior. (_initialize_mi_cmd_env): Adjust for disappearance of global inferior_environ. * solib.c (solib_find): Use environment of the current inferior.
280 lines
6.7 KiB
C
280 lines
6.7 KiB
C
/* MI Command Set - environment commands.
|
|
|
|
Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009, 2010
|
|
Free Software Foundation, Inc.
|
|
|
|
Contributed by Red Hat Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "inferior.h"
|
|
#include "value.h"
|
|
#include "mi-out.h"
|
|
#include "mi-cmds.h"
|
|
#include "mi-getopt.h"
|
|
#include "symtab.h"
|
|
#include "target.h"
|
|
#include "environ.h"
|
|
#include "command.h"
|
|
#include "ui-out.h"
|
|
#include "top.h"
|
|
|
|
#include "gdb_string.h"
|
|
#include "gdb_stat.h"
|
|
|
|
static void env_mod_path (char *dirname, char **which_path);
|
|
extern void _initialize_mi_cmd_env (void);
|
|
|
|
static const char path_var_name[] = "PATH";
|
|
static char *orig_path = NULL;
|
|
|
|
/* The following is copied from mi-main.c so for m1 and below we can
|
|
perform old behavior and use cli commands. If ARGS is non-null,
|
|
append it to the CMD. */
|
|
static void
|
|
env_execute_cli_command (const char *cmd, const char *args)
|
|
{
|
|
if (cmd != 0)
|
|
{
|
|
struct cleanup *old_cleanups;
|
|
char *run;
|
|
if (args != NULL)
|
|
run = xstrprintf ("%s %s", cmd, args);
|
|
else
|
|
run = xstrdup (cmd);
|
|
old_cleanups = make_cleanup (xfree, run);
|
|
execute_command ( /*ui */ run, 0 /*from_tty */ );
|
|
do_cleanups (old_cleanups);
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
/* Print working directory. */
|
|
void
|
|
mi_cmd_env_pwd (char *command, char **argv, int argc)
|
|
{
|
|
if (argc > 0)
|
|
error (_("mi_cmd_env_pwd: No arguments required"));
|
|
|
|
if (mi_version (uiout) < 2)
|
|
{
|
|
env_execute_cli_command ("pwd", NULL);
|
|
return;
|
|
}
|
|
|
|
/* Otherwise the mi level is 2 or higher. */
|
|
|
|
if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
|
|
error (_("mi_cmd_env_pwd: error finding name of working directory: %s"),
|
|
safe_strerror (errno));
|
|
|
|
ui_out_field_string (uiout, "cwd", gdb_dirbuf);
|
|
}
|
|
|
|
/* Change working directory. */
|
|
void
|
|
mi_cmd_env_cd (char *command, char **argv, int argc)
|
|
{
|
|
if (argc == 0 || argc > 1)
|
|
error (_("mi_cmd_env_cd: Usage DIRECTORY"));
|
|
|
|
env_execute_cli_command ("cd", argv[0]);
|
|
}
|
|
|
|
static void
|
|
env_mod_path (char *dirname, char **which_path)
|
|
{
|
|
if (dirname == 0 || dirname[0] == '\0')
|
|
return;
|
|
|
|
/* Call add_path with last arg 0 to indicate not to parse for
|
|
separator characters. */
|
|
add_path (dirname, which_path, 0);
|
|
}
|
|
|
|
/* Add one or more directories to start of executable search path. */
|
|
void
|
|
mi_cmd_env_path (char *command, char **argv, int argc)
|
|
{
|
|
char *exec_path;
|
|
char *env;
|
|
int reset = 0;
|
|
int optind = 0;
|
|
int i;
|
|
char *optarg;
|
|
enum opt
|
|
{
|
|
RESET_OPT
|
|
};
|
|
static struct mi_opt opts[] =
|
|
{
|
|
{"r", RESET_OPT, 0},
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
dont_repeat ();
|
|
|
|
if (mi_version (uiout) < 2)
|
|
{
|
|
for (i = argc - 1; i >= 0; --i)
|
|
env_execute_cli_command ("path", argv[i]);
|
|
return;
|
|
}
|
|
|
|
/* Otherwise the mi level is 2 or higher. */
|
|
while (1)
|
|
{
|
|
int opt = mi_getopt ("mi_cmd_env_path", argc, argv, opts,
|
|
&optind, &optarg);
|
|
if (opt < 0)
|
|
break;
|
|
switch ((enum opt) opt)
|
|
{
|
|
case RESET_OPT:
|
|
reset = 1;
|
|
break;
|
|
}
|
|
}
|
|
argv += optind;
|
|
argc -= optind;
|
|
|
|
|
|
if (reset)
|
|
{
|
|
/* Reset implies resetting to original path first. */
|
|
exec_path = xstrdup (orig_path);
|
|
}
|
|
else
|
|
{
|
|
/* Otherwise, get current path to modify. */
|
|
env = get_in_environ (current_inferior ()->environment, path_var_name);
|
|
|
|
/* Can be null if path is not set. */
|
|
if (!env)
|
|
env = "";
|
|
exec_path = xstrdup (env);
|
|
}
|
|
|
|
for (i = argc - 1; i >= 0; --i)
|
|
env_mod_path (argv[i], &exec_path);
|
|
|
|
set_in_environ (current_inferior ()->environment, path_var_name, exec_path);
|
|
xfree (exec_path);
|
|
env = get_in_environ (current_inferior ()->environment, path_var_name);
|
|
ui_out_field_string (uiout, "path", env);
|
|
}
|
|
|
|
/* Add zero or more directories to the front of the source path. */
|
|
void
|
|
mi_cmd_env_dir (char *command, char **argv, int argc)
|
|
{
|
|
int i;
|
|
int optind = 0;
|
|
int reset = 0;
|
|
char *optarg;
|
|
enum opt
|
|
{
|
|
RESET_OPT
|
|
};
|
|
static struct mi_opt opts[] =
|
|
{
|
|
{"r", RESET_OPT, 0},
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
dont_repeat ();
|
|
|
|
if (mi_version (uiout) < 2)
|
|
{
|
|
for (i = argc - 1; i >= 0; --i)
|
|
env_execute_cli_command ("dir", argv[i]);
|
|
return;
|
|
}
|
|
|
|
/* Otherwise mi level is 2 or higher. */
|
|
while (1)
|
|
{
|
|
int opt = mi_getopt ("mi_cmd_env_dir", argc, argv, opts,
|
|
&optind, &optarg);
|
|
if (opt < 0)
|
|
break;
|
|
switch ((enum opt) opt)
|
|
{
|
|
case RESET_OPT:
|
|
reset = 1;
|
|
break;
|
|
}
|
|
}
|
|
argv += optind;
|
|
argc -= optind;
|
|
|
|
if (reset)
|
|
{
|
|
/* Reset means setting to default path first. */
|
|
xfree (source_path);
|
|
init_source_path ();
|
|
}
|
|
|
|
for (i = argc - 1; i >= 0; --i)
|
|
env_mod_path (argv[i], &source_path);
|
|
|
|
ui_out_field_string (uiout, "source-path", source_path);
|
|
forget_cached_source_info ();
|
|
}
|
|
|
|
/* Set the inferior terminal device name. */
|
|
void
|
|
mi_cmd_inferior_tty_set (char *command, char **argv, int argc)
|
|
{
|
|
set_inferior_io_terminal (argv[0]);
|
|
}
|
|
|
|
/* Print the inferior terminal device name */
|
|
void
|
|
mi_cmd_inferior_tty_show (char *command, char **argv, int argc)
|
|
{
|
|
const char *inferior_io_terminal = get_inferior_io_terminal ();
|
|
|
|
if ( !mi_valid_noargs ("mi_cmd_inferior_tty_show", argc, argv))
|
|
error (_("mi_cmd_inferior_tty_show: Usage: No args"));
|
|
|
|
if (inferior_io_terminal)
|
|
ui_out_field_string (uiout, "inferior_tty_terminal", inferior_io_terminal);
|
|
}
|
|
|
|
void
|
|
_initialize_mi_cmd_env (void)
|
|
{
|
|
struct gdb_environ *environment;
|
|
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 suchs 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);
|
|
|
|
/* Can be null if path is not set. */
|
|
if (!env)
|
|
env = "";
|
|
orig_path = xstrdup (env);
|
|
}
|