diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20T13·39+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-09-20T13·41+0200 |
| commit | 4de06391058724814756a8c74ae36c279cf34006 (patch) | |
| tree | 70a889545dc8a51a1839106da66e9f03e009fcc0 /src/libutil/util.hh | |
| parent | 9fc4cb2ae970f860bc309cbaf40957f53a36d423 (diff) | |
nix-shell: Fix $PATH handling in the impure case
We were passing "p=$PATH" rather than "p=$PATH;", resulting in some invalid shell code. Also, construct a separate environment for the child rather than overwriting the parent's.
Diffstat (limited to 'src/libutil/util.hh')
| -rw-r--r-- | src/libutil/util.hh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libutil/util.hh b/src/libutil/util.hh index 182a38fb39..221165780a 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -8,9 +8,11 @@ #include <dirent.h> #include <unistd.h> #include <signal.h> + #include <functional> #include <limits> #include <cstdio> +#include <map> #ifndef HAVE_STRUCT_DIRENT_D_TYPE #define DT_UNKNOWN 0 @@ -25,6 +27,9 @@ namespace nix { /* Return an environment variable. */ string getEnv(const string & key, const string & def = ""); +/* Get the entire environment. */ +std::map<std::string, std::string> getEnv(); + /* Return an absolutized path, resolving paths relative to the specified directory, or the current directory otherwise. The path is also canonicalised. */ |