nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Don't abort when $PATH is undefined. 

* nix/nix-daemon/guix-daemon.cc (main): Check whether getenv ("PATH")
  returns NULL before blindly initializing 'search_path'.  Before that
  'guix-daemon' would abort when run in an environment where 'PATH' is
  undefined.
This commit is contained in:
Ludovic Courtès 2014-04-09 23:05:42 +02:00
parent 9132b9bd72
commit 18d9a4466c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nix/nix-daemon/guix-daemon.cc
View File

@ -257,8 +257,14 @@ main (int argc, char *argv[])
/* Hackily help 'local-store.cc' find our 'guix-authenticate' program, which /* Hackily help 'local-store.cc' find our 'guix-authenticate' program, which
is known as 'OPENSSL_PATH' here. */ is known as 'OPENSSL_PATH' here. */
std::string search_path (getenv ("PATH")); std::string search_path;
search_path = settings.nixLibexecDir + ":" + search_path; search_path = settings.nixLibexecDir;
if (getenv ("PATH") != NULL)
{
search_path += ":";
search_path += getenv ("PATH");
}
setenv ("PATH", search_path.c_str (), 1); setenv ("PATH", search_path.c_str (), 1);
/* Use our substituter by default. */ /* Use our substituter by default. */