diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-05-12T09·35+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-05-12T09·35+0000 |
commit | 8c0b42f857b53993d95c5bc077e8f8a71028c5ac (patch) | |
tree | 8911f759371585a66cfd6b5ad604fff0a97779ba /src/libutil/util.cc | |
parent | c8d3882cdc8f9e22c58af285c1996265c1af75d5 (diff) |
* An quick and dirty hack to support distributed builds.
Diffstat (limited to 'src/libutil/util.cc')
-rw-r--r-- | src/libutil/util.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc index bf2954f5342a..399233983d62 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -29,6 +29,13 @@ SysError::SysError(const format & f) } +string getEnv(const string & key, const string & def) +{ + char * value = getenv(key.c_str()); + return value ? string(value) : def; +} + + Path absPath(Path path, Path dir) { if (path[0] != '/') { @@ -206,8 +213,7 @@ void makePathReadOnly(const Path & path) static Path tempName() { static int counter = 0; - char * s = getenv("TMPDIR"); - Path tmpRoot = s ? canonPath(Path(s)) : "/tmp"; + Path tmpRoot = canonPath(getEnv("TMPDIR", "/tmp")); return (format("%1%/nix-%2%-%3%") % tmpRoot % getpid() % counter++).str(); } |