diff options
| author | Vladimir Prus <vladimir@codesourcery.com> | 2010-01-20 14:23:07 +0000 |
|---|---|---|
| committer | Vladimir Prus <vladimir@codesourcery.com> | 2010-01-20 14:23:07 +0000 |
| commit | 3f81c18a86568f2d36fda242e9221a3526550f64 (patch) | |
| tree | 7a69a7d908e74eb4b02ba02e4f89f65089e9b347 /gdb/solib.c | |
| parent | 760f3a89bc848e34713cbbe356c1dfb5af2514ba (diff) | |
| download | gdb-3f81c18a86568f2d36fda242e9221a3526550f64.zip gdb-3f81c18a86568f2d36fda242e9221a3526550f64.tar.gz gdb-3f81c18a86568f2d36fda242e9221a3526550f64.tar.bz2 | |
Per-inferior args and tty and environment.
* 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.
Diffstat (limited to 'gdb/solib.c')
| -rw-r--r-- | gdb/solib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gdb/solib.c b/gdb/solib.c index 21006d8..842b27c 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -227,14 +227,16 @@ solib_find (char *in_pathname, int *fd) /* If not found, next search the inferior's $PATH environment variable. */ if (found_file < 0 && gdb_sysroot_is_empty) - found_file = openp (get_in_environ (inferior_environ, "PATH"), + found_file = openp (get_in_environ (current_inferior ()->environment, + "PATH"), OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY, &temp_pathname); /* If not found, next search the inferior's $LD_LIBRARY_PATH environment variable. */ if (found_file < 0 && gdb_sysroot_is_empty) - found_file = openp (get_in_environ (inferior_environ, "LD_LIBRARY_PATH"), + found_file = openp (get_in_environ (current_inferior ()->environment, + "LD_LIBRARY_PATH"), OPF_TRY_CWD_FIRST, in_pathname, O_RDONLY | O_BINARY, &temp_pathname); |