From 35b185ee631a9eb0a5ff7a555fa56542d75b4a09 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 18 Mar 2016 21:54:24 +0000 Subject: [PATCH] use environ module from ostd --- main.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main.cc b/main.cc index a81f0a4..14eab8b 100644 --- a/main.cc +++ b/main.cc @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -523,14 +524,14 @@ int main(int argc, char **argv) { os.result->set_cstr(""); return; } - auto ret = ConstCharRange(getenv(ostd::String(args[0].get_str()).data())); - if (ret.empty()) { + auto ret = ostd::environ::get(args[0].get_str()); + if (!ret) { if (!args[1].get_str().empty()) os.result->set_str_dup(args[1].get_str()); else os.result->set_cstr(""); } else { - os.result->set_str_dup(ret); + os.result->set_str_dup(ret.value()); } });