second part of: change offset arguments to various <T>Buffer::read/merge methods...
[ardour.git] / libs / pbd / epa.cc
index 3d3f7477d7dfe56151a809b52398fed86698b1b1..4af2029308559273775c628cd058a4180fffc7d7 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010 Paul Davis 
+    Copyright (C) 2010 Paul Davis
 
     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
 
 */
 
+#include <glib.h>
+
 #include <cstdlib>
-#include <iostream>
 
 #include "pbd/epa.h"
 #include "pbd/strsplit.h"
 
+#ifdef COMPILER_MSVC
+#define environ        _environ
+_CRTIMP extern char ** _environ;
+#else
 extern char** environ;
+#endif
 
 using namespace PBD;
 using namespace std;
@@ -58,17 +64,17 @@ EnvironmentalProtectionAgency::save ()
         e.clear ();
 
         if (!_envname.empty()) {
-                
+
                 /* fetch environment from named environment variable, rather than "environ"
                  */
 
-                const char* estr = getenv (_envname.c_str());
+                const char* estr = g_getenv (_envname.c_str());
 
                 if (!estr) {
                         return;
                 }
-                
-                /* parse line by line, and save into "e" 
+
+                /* parse line by line, and save into "e"
                  */
 
                 vector<string> lines;
@@ -78,44 +84,73 @@ EnvironmentalProtectionAgency::save ()
 
                         string estring = *i;
                         string::size_type equal = estring.find_first_of ('=');
-                        
+
                         if (equal == string::npos) {
                                 /* say what? an environ value without = ? */
                                 continue;
                         }
-                        
+
                         string before = estring.substr (0, equal);
                         string after = estring.substr (equal+1);
-                        
+
                         e.insert (pair<string,string>(before,after));
                 }
-                
+
         } else {
 
                 /* fetch environment from "environ"
                  */
 
                 for (size_t i = 0; environ[i]; ++i) {
-                        
+
                         string estring = environ[i];
                         string::size_type equal = estring.find_first_of ('=');
-                        
+
                         if (equal == string::npos) {
                                 /* say what? an environ value without = ? */
                                 continue;
                         }
-                        
+
                         string before = estring.substr (0, equal);
                         string after = estring.substr (equal+1);
-                        
+
                         e.insert (pair<string,string>(before,after));
                 }
         }
-}                         
+}
 void
 EnvironmentalProtectionAgency::restore () const
 {
+               clear ();
+
         for (map<string,string>::const_iterator i = e.begin(); i != e.end(); ++i) {
-                setenv (i->first.c_str(), i->second.c_str(), 1);
+                g_setenv (i->first.c_str(), i->second.c_str(), 1);
         }
-}                         
+}
+
+void
+EnvironmentalProtectionAgency::clear () const
+{
+       /* Copy the environment before using (g_)unsetenv() because on some
+          platforms (maybe all?) this directly modifies the environ array,
+          cause complications for iterating through it.
+       */
+
+       vector<string> ecopy;
+
+        for (size_t i = 0; environ[i]; ++i) {
+               ecopy.push_back (environ[i]);
+       }
+
+       for (vector<string>::const_iterator e = ecopy.begin(); e != ecopy.end(); ++e) {
+                string::size_type equal = (*e).find_first_of ('=');
+
+                if (equal == string::npos) {
+                        /* say what? an environ value without = ? */
+                        continue;
+                }
+
+                string var_name = (*e).substr (0, equal);
+                g_unsetenv(var_name.c_str());
+        }
+}