aboutsummaryrefslogtreecommitdiffstats
path: root/modules/es_unix/unix_cmd.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-04-10 05:50:57 +0000
committerlloyd <[email protected]>2008-04-10 05:50:57 +0000
commit59e71322cad61ff2f09664fc3e59b5446af4566a (patch)
treed6bf11f3541d891228f755eeb0a2fef1904852eb /modules/es_unix/unix_cmd.cpp
parenta5cbd8f304d646352789686a659c6923e320f22d (diff)
Remove severa global configuration variables related to entropy gathering,
instead passing those values as arguments.
Diffstat (limited to 'modules/es_unix/unix_cmd.cpp')
-rw-r--r--modules/es_unix/unix_cmd.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/es_unix/unix_cmd.cpp b/modules/es_unix/unix_cmd.cpp
index a83063f7f..6fcfa0d40 100644
--- a/modules/es_unix/unix_cmd.cpp
+++ b/modules/es_unix/unix_cmd.cpp
@@ -128,10 +128,8 @@ std::string DataSource_Command::id() const
/*************************************************
* Create the pipe *
*************************************************/
-void DataSource_Command::create_pipe(const std::string& path)
+void DataSource_Command::create_pipe(const std::vector<std::string>& paths)
{
- const std::vector<std::string> paths = split_on(path, ':');
-
bool found_something = false;
for(u32bit j = 0; j != paths.size(); j++)
{
@@ -216,7 +214,7 @@ void DataSource_Command::shutdown_pipe()
* DataSource_Command Constructor *
*************************************************/
DataSource_Command::DataSource_Command(const std::string& prog_and_args,
- const std::string& path) :
+ const std::vector<std::string>& paths) :
MAX_BLOCK_USECS(100000), KILL_WAIT(10000)
{
arg_list = split_on(prog_and_args, ' ');
@@ -227,7 +225,7 @@ DataSource_Command::DataSource_Command(const std::string& prog_and_args,
throw Invalid_Argument("DataSource_Command: Too many args");
pipe = 0;
- create_pipe(path);
+ create_pipe(paths);
}
/*************************************************