OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix PR gdb/21954: make 'unset environment' work again

Browse Source 
When I made commit 9a6c7d9c02, which
C++-fied gdb/common/environ.[ch], I mistakenly altered the behaviour
of the 'unset environment' command.  This command, which should delete
all environment variables, is now resetting the list of variables to
the state they were when GDB was started.

This commit fixes this regression, and also adds a test on
gdb.base/environ.exp which really checks if 'unset environment'
worked.

gdb/ChangeLog:
2017-08-15  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR gdb/21954
	* infcmd.c (unset_environment_command): Use the 'clear' method on
	the environment instead of resetting it.

gdb/testsuite/ChangeLog:
2017-08-15  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR gdb/21954
	* gdb.base/environ.exp: Add test to check if 'unset environment'
	works.
This commit is contained in:
Sergio Durigan Junior 2017-08-15 13:49:18 -04:00
parent 0335ac6d12
commit 206726fbfd
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2017-08-15 Sergio Durigan Junior <sergiodj@redhat.com>
PR gdb/21954
* infcmd.c (unset_environment_command): Use the 'clear' method on
the environment instead of resetting it.
2017-08-15 John Baldwin <jhb@FreeBSD.org>
* fbsd-nat.c (fbsd_convert_siginfo): Fix compile on big-endian

2
gdb/infcmd.c
View File

@ -2230,7 +2230,7 @@ unset_environment_command (char *var, int from_tty)
/* If there is no argument, delete all environment variables.
Ask for confirmation if reading from the terminal. */
if (!from_tty || query (_("Delete all environment variables? ")))
current_inferior ()->environment = gdb_environ::from_host_environ ();
current_inferior ()->environment.clear ();
}
else
current_inferior ()->environment.unset (var);

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2017-08-15 Sergio Durigan Junior <sergiodj@redhat.com>
PR gdb/21954
* gdb.base/environ.exp: Add test to check if 'unset environment'
works.
2017-08-14 Andreas Arnez <arnez@linux.vnet.ibm.com>
* lib/gdb.exp (universal_compile_options): New caching proc.

3
gdb/testsuite/gdb.base/environ.exp
View File

@ -46,6 +46,9 @@ gdb_test "unset environment" "" "unset all environment variables" \
"Delete all environment variables. .y or n. $" \
"y"
gdb_test_no_output "show environment" \
"all environment variables have been unset"
# Verify that we can set a specific environment variable.
test_set_show_env_var "EDITOR" "emacs" "set environment variable"