Use getenv_s

Author: mcbarton

lib/Interpreter/DynamicLibraryManager.cpp

@@ -52,13 +52,9 @@ namespace Cpp {
     // Behaviour is to not add paths that don't exist...In an interpreted env
     // does this make sense? Path could pop into existance at any time.
     for (const char* Var : kSysLibraryEnv) {
-#ifdef _WIN32
       char* Env = nullptr;
       size_t sz = 0;
-      if (_dupenv_s(&Env, &sz, Var)) {
-#else
-      if (const char* Env = ::getenv(Var)) {
-#endif
+      if (getenv_s(&sz,&Env, &sz, Var)) {
         SmallVector<StringRef, 10> CurPaths;
         SplitPaths(Env, CurPaths, utils::kPruneNonExistant, Cpp::utils::platform::kEnvDelim);
         for (const auto& Path : CurPaths)

lib/Interpreter/Paths.cpp

@@ -168,18 +168,14 @@ bool ExpandEnvVars(std::string& Str, bool Path) {
 
     std::string EnvVar = Str.substr(DPos + 1, Length -1); //"HOME"
     std::string FullPath;
-#ifdef _WIN32
     char* Tok = nullptr;
     size_t sz = 0;
-    if (_dupenv_s(&Tok, &sz, EnvVar.c_str()))
-#else
-    if (const char* Tok = getenv(EnvVar.c_str()))
-#endif
+    if (getenv_s(&sz,&Tok, &sz, EnvVar.c_str())) {
       FullPath = Tok;
 
-    Str.replace(DPos, Length, FullPath);
-    DPos = Str.find("$", DPos + 1); //search for next env variable
-  }
+      Str.replace(DPos, Length, FullPath);
+      DPos = Str.find("$", DPos + 1); //search for next env variable
+    }
   if (!Path)
     return true;
   return llvm::sys::fs::exists(Str.c_str());