diff options
| author | Aditya Mandaleeka <adityam@microsoft.com> | 2016-02-08 16:14:57 -0800 |
|---|---|---|
| committer | Aditya Mandaleeka <adityam@microsoft.com> | 2016-02-26 12:52:14 -0800 |
| commit | 404c73d924bd999df383a5ed46ca6d65d9b57131 (patch) | |
| tree | dbb41de1c4477caadbed8ae56fc977a35abbe895 /src/pal/src/init | |
| parent | 9ab9bcb2ffba27b8b5b75d23cc14095bd3e6d5b1 (diff) | |
| download | coreclr-404c73d924bd999df383a5ed46ca6d65d9b57131.tar.gz coreclr-404c73d924bd999df383a5ed46ca6d65d9b57131.tar.bz2 coreclr-404c73d924bd999df383a5ed46ca6d65d9b57131.zip | |
Consolidate environment code in environ.cpp.
Diffstat (limited to 'src/pal/src/init')
| -rw-r--r-- | src/pal/src/init/pal.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/pal/src/init/pal.cpp b/src/pal/src/init/pal.cpp index b2efdf2779..95c6e59e26 100644 --- a/src/pal/src/init/pal.cpp +++ b/src/pal/src/init/pal.cpp @@ -34,6 +34,7 @@ Abstract: #include "pal/module.h" #include "pal/virtual.h" #include "pal/misc.h" +#include "pal/environ.h" #include "pal/utils.h" #include "pal/debug.h" #include "pal/locale.h" @@ -240,14 +241,14 @@ Initialize( } // Initialize the environment. - if (FALSE == MiscInitialize()) + if (FALSE == EnvironInitialize()) { goto CLEANUP0; } // Initialize debug channel settings before anything else. // This depends on the environment, so it must come after - // MiscInitialize. + // EnvironInitialize. if (FALSE == DBG_init_channels()) { goto CLEANUP0; @@ -1182,7 +1183,7 @@ static LPWSTR INIT_FindEXEPath(LPCSTR exe_name) /* no path was specified : search $PATH */ - env_path = MiscGetenv("PATH"); + env_path = EnvironGetenv("PATH"); if (!env_path || *env_path=='\0') { WARN("$PATH isn't set.\n"); @@ -1327,7 +1328,7 @@ static LPWSTR INIT_FindEXEPath(LPCSTR exe_name) } InternalFree(env_path); - TRACE("No %s found in $PATH (%s)\n", exe_name, MiscGetenv("PATH")); + TRACE("No %s found in $PATH (%s)\n", exe_name, EnvironGetenv("PATH")); last_resort: /* last resort : see if the executable is in the current directory. This is |