me
/
guix
Archived
1
0
Fork 0
Code

daemon: 'Agent' constructor takes a list of environment variables. 

* nix/libutil/util.hh (struct Agent)[Agent]: Add 'env' parameter.
* nix/libutil/util.cc (Agent::Agent): Honor it.
master
Ludovic Courtès 2020-12-01 15:00:14 +01:00
parent 4a98735297
commit 2e308238ad
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix/libutil/util.cc
View File

@ -1173,7 +1173,7 @@ void commonChildInit(Pipe & logPipe)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
Agent::Agent(const string &command, const Strings &args) Agent::Agent(const string &command, const Strings &args, const std::map<string, string> &env)
{ {
debug(format("starting agent '%1%'") % command); debug(format("starting agent '%1%'") % command);
@ -1191,6 +1191,10 @@ Agent::Agent(const string &command, const Strings &args)
commonChildInit(fromAgent); commonChildInit(fromAgent);
for (auto pair: env) {
setenv(pair.first.c_str(), pair.second.c_str(), 1);
}
if (chdir("/") == -1) throw SysError("changing into `/"); if (chdir("/") == -1) throw SysError("changing into `/");
/* Dup the communication pipes. */ /* Dup the communication pipes. */

7
nix/libutil/util.hh
View File

@ -7,6 +7,7 @@
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
#include <map>
#include <functional> #include <functional>
#include <cstdio> #include <cstdio>
@ -281,8 +282,10 @@ struct Agent
/* The process ID of the agent. */ /* The process ID of the agent. */
Pid pid; Pid pid;
/* The command and arguments passed to the agent. */ /* The command and arguments passed to the agent along with a list of
Agent(const string &command, const Strings &args); environment variable name/value pairs. */
Agent(const string &command, const Strings &args,
const std::map<string, string> &env = std::map<string, string>());
~Agent(); ~Agent();
}; };