FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support "set environment" and "unset environment" in MinGW builds.

Browse source 
* windows-nat.c (env_sort) [!__CYGWIN__]: Function restored from
	before the change on 2006-12-09.
	(windows_create_inferior) [!__CYGWIN__]: Restore code that
	generates the environment block for CreateProcessA, modulo the
	Cygwin-specific parts that are not needed here.
This commit is contained in:
Eli Zaretskii 2011-09-28 09:07:54 +00:00
parent a82526dd00
commit c93dbcba16
2 changed files with 52 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2011-09-28 Eli Zaretskii <eliz@gnu.org>
* windows-nat.c (env_sort) [!__CYGWIN__]: Function restored from
before the change on 2006-12-09.
(windows_create_inferior) [!__CYGWIN__]: Restore code that
generates the environment block for CreateProcessA, modulo the
Cygwin-specific parts that are not needed here.
2011-09-27 Tristan Gingold <gingold@adacore.com> 2011-09-27 Tristan Gingold <gingold@adacore.com>
* target.h (enum target_object): Add TARGET_OBJECT_DARWIN_DYLD_INFO. * target.h (enum target_object): Add TARGET_OBJECT_DARWIN_DYLD_INFO.

45
gdb/windows-nat.c
View file

@ -1951,6 +1951,18 @@ windows_set_console_info (STARTUPINFO *si, DWORD *flags)
*flags |= CREATE_NEW_CONSOLE; *flags |= CREATE_NEW_CONSOLE;
} }
#ifndef __CYGWIN__
/* Function called by qsort to sort environment strings. */
static int
envvar_cmp (const void *a, const void *b)
{
const char **p = (const char **) a;
const char **q = (const char **) b;
return strcasecmp (*p, *q);
}
#endif
/* Start an inferior windows child process and sets inferior_ptid to its pid. /* Start an inferior windows child process and sets inferior_ptid to its pid.
EXEC_FILE is the file to run. EXEC_FILE is the file to run.
ALLARGS is a string containing the arguments to the program. ALLARGS is a string containing the arguments to the program.
@ -1977,6 +1989,12 @@ windows_create_inferior (struct target_ops *ops, char *exec_file,
char *toexec; char *toexec;
char *args; char *args;
HANDLE tty; HANDLE tty;
char *w32env;
char *temp;
size_t envlen;
int i;
size_t envsize;
char **env;
#endif #endif
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
BOOL ret; BOOL ret;
@ -2124,6 +2142,31 @@ windows_create_inferior (struct target_ops *ops, char *exec_file,
} }
} }
/* CreateProcess takes the environment list as a null terminated set of
strings (i.e. two nulls terminate the list). */
/* Get total size for env strings. */
for (envlen = 0, i = 0; in_env[i] && *in_env[i]; i++)
envlen += strlen (in_env[i]) + 1;
envsize = sizeof (in_env[0]) * (i + 1);
env = (char **) alloca (envsize);
memcpy (env, in_env, envsize);
/* Windows programs expect the environment block to be sorted. */
qsort (env, i, sizeof (char *), envvar_cmp);
w32env = alloca (envlen + 1);
/* Copy env strings into new buffer. */
for (temp = w32env, i = 0; env[i] && *env[i]; i++)
{
strcpy (temp, env[i]);
temp += strlen (temp) + 1;
}
/* Final nil string to terminate new env. */
*temp = 0;
windows_init_thread_list (); windows_init_thread_list ();
ret = CreateProcessA (0, ret = CreateProcessA (0,
args, /* command line */ args, /* command line */
@ -2131,7 +2174,7 @@ windows_create_inferior (struct target_ops *ops, char *exec_file,
NULL, /* thread */ NULL, /* thread */
TRUE, /* inherit handles */ TRUE, /* inherit handles */
flags, /* start flags */ flags, /* start flags */
NULL, /* environment */ w32env, /* environment */
NULL, /* current directory */ NULL, /* current directory */
&si, &si,
&pi); &pi);