mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-25 05:40:39 -05:00
Code Issues Projects Releases Wiki Activity

Update base

Browse Source
This commit is contained in:
XMRig
2020-11-29 18:45:52 +07:00
parent bbcf8e2be3
commit 096b09bf4d
23 changed files with 124 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/base/io/Env.cpp
View File

@@ -1,12 +1,6 @@
/* XMRig
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -72,7 +66,7 @@ static void createVariables()
} // namespace xmrig
xmrig::String xmrig::Env::expand(const char *in)
xmrig::String xmrig::Env::expand(const char *in, const std::map<String, String> &extra)
{
# ifdef XMRIG_FEATURE_ENV
if (in == nullptr) {
@@ -96,7 +90,7 @@ xmrig::String xmrig::Env::expand(const char *in)
continue;
}
vars.insert({ var, get(m[1].str().c_str()) });
vars.insert({ var, get(m[1].str().c_str(), extra) });
}
for (const auto &kv : vars) {
@@ -118,15 +112,23 @@ xmrig::String xmrig::Env::expand(const char *in)
}
xmrig::String xmrig::Env::get(const String &name)
xmrig::String xmrig::Env::get(const String &name, const std::map<String, String> &extra)
{
# ifdef XMRIG_FEATURE_ENV
if (variables.empty()) {
createVariables();
}
if (variables.count(name)) {
return variables.at(name);
const auto it = variables.find(name);
if (it != variables.end()) {
return it->second;
}
if (!extra.empty()) {
const auto it = extra.find(name);
if (it != extra.end()) {
return it->second;
}
}
# endif