Environment redesign and test/examples review. English API revisions

[anna.git] / source / core / util / Environment.cpp

diff --git a/source/core/util/Environment.cpp b/source/core/util/Environment.cpp
index 83ed2f8..820c9ab 100644 (file)
--- a/source/core/util/Environment.cpp
+++ b/source/core/util/Environment.cpp
@@ -39,90 +39,111 @@
 #include <anna/config/defines.hpp>
 #include <anna/core/tracing/Logger.hpp>
 #include <anna/core/tracing/TraceMethod.hpp>
+#include <anna/core/functions.hpp>
 
-#include <boost/program_options.hpp>
-#include <boost/algorithm/string.hpp>
-
-
-#include <stdlib.h>
+#include <stdlib.h> // getenv / setenv
+#include <string>
 
 
 
 using namespace std;
 using namespace anna;
 
+extern int errno;
 
-
-void Environment::initialize() throw() {
+void Environment::initialize(char **envp) throw() {
   LOGMETHOD(TraceMethod tm("Environment", "initialize", ANNA_FILE_LOCATION));
   // clear data
-  a_managedVars.clear();
-  // Register:
-  namespace po = boost::program_options;
-  po::options_description desc("Options");
-  FILE *fp;
-  char c_var[256];
-  std::string var;
-  /* Open the command for reading. */
-  fp = popen("env | cut -d'=' -f1", "r");
-
-  if(fp == NULL) {
-    Logger::error("Failed to get environment variables list", ANNA_FILE_LOCATION);
-    return;
+  a_vars.clear();
+  if (!envp) return;
+
+  // register data
+  std::string assignment, var, val;
+  while (*envp) {
+    assignment = *envp; 
+    std::size_t equalPos = assignment.find("=");
+    if (equalPos !=  string::npos) { // protection
+      var = assignment.substr(0, equalPos - 1);
+      val = assignment.substr(equalPos, assignment.size() - 1);
+      a_vars[var] = val;
+    }
+    envp++;
   }
+}
 
-  /* Read the output a line at a time - output it. */
-  while(fgets(c_var, sizeof(c_var) - 1, fp) != NULL) {
-    var = c_var;
-    boost::trim(var);
-    desc.add_options()(var.c_str(), var.c_str());
-    a_managedVars[var] = ""; // temporary
-  }
+std::string Environment::getValue(const char* variableName, bool exceptionIfMissing) throw(RuntimeException) {
+  if(!variableName)
+    throw RuntimeException("Invalid NULL variable name!", ANNA_FILE_LOCATION);
+
+  std::string var = variableName;
+
+  return getValue(var, exceptionIfMissing);
+}
 
-  /* close */
-  pclose(fp);
-  // Parsing:
-  po::variables_map vm;
+std::string Environment::getValue(const std::string &variableName, bool exceptionIfMissing) throw(RuntimeException) {
+  std::string result = "";
 
-  try {
-    po::store(po::parse_environment(desc, [](const std::string & variable) { return variable; }), vm); // can throw
-    std::map<std::string, std::string>::const_iterator it;
-    std::string var, val;
+  std::map<std::string, std::string>::const_iterator it = a_vars.find(variableName);
 
-    for(it = a_managedVars.begin(); it != a_managedVars.end(); it++) {
-      var = (*it).first;
+  if(it == a_vars.end()) {
+    char *current = getenv (variableName.c_str());
+    if (!current) {
+      std::string msg = "The variable '";
+      msg += variableName;
+      msg += "' is not defined in the environment.";
+      LOGDEBUG(Logger::debug(msg, ANNA_FILE_LOCATION));
 
-      if(vm.count(var.c_str())) { // protection
-        val = vm[var.c_str()].as<std::string>();
-        a_managedVars[var] = val;
-      }
+      if(exceptionIfMissing) throw RuntimeException(msg, ANNA_FILE_LOCATION);
     }
-
-    po::notify(vm);
-  } catch(po::error& e) {
-    Logger::error(e.what(), ANNA_FILE_LOCATION);
+    else {
+      // assignment
+      a_vars[variableName] = current;
+      result = current;
+    }
+  }
+  else {
+    result = it->second;
   }
+
+  return result;
 }
 
-std::string Environment::getValue(const char* variableName, bool exceptionIfMissing) const throw(RuntimeException) {
-  std::string result = "";
 
-  if(!variableName)
-    throw RuntimeException("Invalid NULL variable name!", ANNA_FILE_LOCATION);
+void Environment::setVariable(const std::string &name, const std::string &value, bool overwrite) throw(RuntimeException) {
+
+  if (name == "") throw RuntimeException("Must provide non-empty variable name", ANNA_FILE_LOCATION);
+
+  if(setenv(name.c_str(), value.c_str(), overwrite ? 1:0) != 0) {
+    std::string msg = "Cannot set the environment variable '";
+    msg += name;
+    msg += "=\"";
+    msg += value;
+    msg += "\"'. The errno is ";
+    msg += anna::functions::asString(errno);
+
+    throw RuntimeException(msg, ANNA_FILE_LOCATION);
+  }
+
+  // optimization
+  if (overwrite) 
+    a_vars[name] = value;
+}
+
 
-  std::map<std::string, std::string>::const_iterator it = a_managedVars.find(variableName);
+void Environment::unsetVariable(const std::string &name) throw(RuntimeException) {
 
-  if(it == a_managedVars.end()) {
-    std::string msg = "The variable '";
-    msg += variableName;
-    msg += "' is not defined in the environment.";
-    LOGDEBUG(Logger::debug(msg, ANNA_FILE_LOCATION));
+  if (name == "") throw RuntimeException("Must provide non-empty variable name", ANNA_FILE_LOCATION);
 
-    if(exceptionIfMissing) throw RuntimeException(msg, ANNA_FILE_LOCATION);
+  if(unsetenv(name.c_str()) != 0) {
+    std::string msg = "Cannot unset the environment variable named '";
+    msg += name;
+    msg += "'. The errno is ";
+    msg += anna::functions::asString(errno);
 
-    return "";
+    throw RuntimeException(msg, ANNA_FILE_LOCATION);
   }
 
-  return it->second;
+  std::map<std::string, std::string>::iterator it = a_vars.find(name);
+  if(it != a_vars.end()) a_vars.erase(it);
 }