aboutsummaryrefslogtreecommitdiff
path: root/build2/functions-builtin.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-06-20 09:51:56 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-06-20 09:51:56 +0200
commit353438a94953bf4d093af0d84decd5ec7529ed34 (patch)
tree4c4e376ff8d831e85954a9b74f2157ad4b06351a /build2/functions-builtin.cxx
parentc6b3f6659eda9b0b255ddc2d24accdd998b5938d (diff)
Add $process.run() and $process.run_regex() functions
$process.run(<prog>[ <args>...]) Return trimmed stdout. $process.run_regex(<prog>[ <args>...], <pat> [, <fmt>]) Return stdout lines matched and optionally processed with regex. Each line of stdout (including the customary trailing blank) is matched (as a whole) against <pat> and, if successful, returned, optionally processed with <fmt>, as an element of a list.
Diffstat (limited to 'build2/functions-builtin.cxx')
-rw-r--r--build2/functions-builtin.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/build2/functions-builtin.cxx b/build2/functions-builtin.cxx
index 45ad7df..8db38c2 100644
--- a/build2/functions-builtin.cxx
+++ b/build2/functions-builtin.cxx
@@ -11,7 +11,7 @@ namespace build2
// otherwise.
//
static inline value
- getvar (const string& name)
+ getenvvar (const string& name)
{
optional<string> v (getenv (name));
@@ -19,7 +19,7 @@ namespace build2
return value ();
names r;
- r.emplace_back (to_name (*v));
+ r.emplace_back (to_name (move (*v)));
return value (move (r));
}
@@ -45,12 +45,12 @@ namespace build2
//
f["getenv"] = [](string name)
{
- return getvar (name);
+ return getenvvar (name);
};
f["getenv"] = [](names name)
{
- return getvar (convert<string> (move (name)));
+ return getenvvar (convert<string> (move (name)));
};
}
}