diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2014-12-02 10:16:03 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2014-12-02 10:16:03 +0000 |
| commit | 9119d13db870473f40d7678a980009e12a0d2379 (patch) | |
| tree | b5227028ccff6e9566a25bd251d74b51e40a4ce0 /winsup/cygwin/environ.h | |
| parent | 0c326d84b59308341b3c88394373c7dd8b4918dc (diff) | |
| download | cygnal-9119d13db870473f40d7678a980009e12a0d2379.tar.gz cygnal-9119d13db870473f40d7678a980009e12a0d2379.tar.bz2 cygnal-9119d13db870473f40d7678a980009e12a0d2379.zip | |
* autoload.cc (CreateEnvironmentBlock): Import.
(DestroyEnvironmentBlock): Import.
* environ.cc (env_compare): New static bsearch comparison function.
(build_env): Add parameter taking a user token. If token is non-NULL,
fetch user's default Windows environment and merge it into the resulting
environment. Explain what we do in preceeding comment.
* environ,h (build_env): Align prototype to above change.
* external.cc (create_winenv): Call build_env with NULL token.
* spawn.cc (child_info_spawn::worker): When spawning new process under
another user account, call build_env with new token to allow merging
user's default Windows environment.
* winlean.h (_USERENV_): Define to override dllimport.
Diffstat (limited to 'winsup/cygwin/environ.h')
| -rw-r--r-- | winsup/cygwin/environ.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/environ.h b/winsup/cygwin/environ.h index b2d65c8bd..5048fcd2f 100644 --- a/winsup/cygwin/environ.h +++ b/winsup/cygwin/environ.h @@ -1,6 +1,6 @@ /* environ.h: Declarations for environ manipulation - Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2008, 2013 Red Hat, Inc. + Copyright 2000, 2001, 2002, 2003, 2005, 2006, 2008, 2013, 2014 Red Hat, Inc. This file is part of Cygwin. @@ -45,6 +45,6 @@ extern "C" char **__cygwin_environ, ***main_environ; extern "C" char __stdcall **cur_environ (); #endif char ** __reg3 build_env (const char * const *envp, PWCHAR &envblock, - int &envc, bool need_envblock); + int &envc, bool need_envblock, HANDLE new_token); #define ENV_CVT -1 |