diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-06-14 22:58:24 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-06-15 14:18:57 +0300 |
| commit | bc1f722b043e654808a95e1d7acb85b86e4aed6a (patch) | |
| tree | d84b3688940d6f4f9e85cc6a53224e54ba6289de /bdep/sync.cxx | |
| parent | 4ff307952533453e1e8650f714b5eb82e407f072 (diff) | |
Use portable environment variable manipulation functions
Diffstat (limited to 'bdep/sync.cxx')
| -rw-r--r-- | bdep/sync.cxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/bdep/sync.cxx b/bdep/sync.cxx index 7df2c9e..8cfdc7a 100644 --- a/bdep/sync.cxx +++ b/bdep/sync.cxx @@ -4,8 +4,6 @@ #include <bdep/sync.hxx> -#include <stdlib.h> // getenv() setenv()/_putenv() - #include <cstring> // strchr() #include <bdep/database.hxx> @@ -489,8 +487,8 @@ namespace bdep string v; const string& p (d.string ()); - if (const char* e = getenv (synced_name)) - v = e; + if (optional<string> e = getenv (synced_name)) + v = move (*e); for (size_t b (0), e (0); (e = v.find ('"', e)) != string::npos; // Skip leading ' '. @@ -514,12 +512,7 @@ namespace bdep if (add) { v += (v.empty () ? "\"" : " \"") + p + '"'; - -#ifndef _WIN32 - setenv (synced_name, v.c_str (), 1 /* overwrite */); -#else - _putenv ((string (synced_name) + '=' + v).c_str ()); -#endif + setenv (synced_name, v); } return false; @@ -693,14 +686,14 @@ namespace bdep // noop loads the buildfiles. Maybe need something like bootstrap // and load meta-operation? // - const char* open (getenv ("BPKG_OPEN_CONFIG")); + optional<string> open (getenv ("BPKG_OPEN_CONFIG")); for (dir_path d: o.config ()) { d.complete (); d.normalize (); - if (open != nullptr && d.string () == open) + if (open && d.string () == *open) continue; if (synced (d, o.implicit (), false /* add */)) |