From 583eda7d3132216ec5cfb5f9dcabd845109cdc26 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Sun, 18 Oct 2009 23:06:39 +0200
Subject: Fixing some codepath.

---
 lib/String.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/String.cc b/lib/String.cc
index aee7b8d..14195f6 100644
--- a/lib/String.cc
+++ b/lib/String.cc
@@ -155,7 +155,7 @@ const char * String::set(const char * s, va_list ap) {
     r = str;
 #else // !HAVE_VASPRINTF
 #ifdef HAVE_VSNPRINTF
-    char String::t[BUFSIZ + 1];
+    char t[BUFSIZ + 1];
     vsnprintf(t, BUFSIZ, s, ap);
     str = Base::strdup(r = t);
 #else // !HAVE_VSNPRINTF
@@ -164,12 +164,12 @@ const char * String::set(const char * s, va_list ap) {
     r = str = (char *) malloc(_vscprintf(s, ap) + 1);
     vsprintf(str, s, ap);
 #else
-    char String::t[BUFSIZ + 1];
+    char t[BUFSIZ + 1];
     _vsnprintf(t, BUFSIZ, s, ap);
     str = Base::strdup(r = t);
 #endif
 #else
-    char String::t[BUFSIZ + 1];
+    char t[BUFSIZ + 1];
     vsprintf(t, s, ap);
     str = Base::strdup(r = t);
 #endif
-- 
cgit v1.2.3


From 213a25a18eae1bf57b93618b1b7bbd2fc36fde59 Mon Sep 17 00:00:00 2001
From: Pixel <pixel@nobis-crew.org>
Date: Tue, 20 Oct 2009 01:07:52 +0200
Subject: Supporting win32's getenv/setenv.

---
 lib/BLua.cc | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/BLua.cc b/lib/BLua.cc
index 76cd443..5ff970e 100644
--- a/lib/BLua.cc
+++ b/lib/BLua.cc
@@ -339,8 +339,22 @@ int LuaStatics::getenv(lua_State * _L) {
     if (n != 1) {
         L->error("Incorrect arguments to function `getenv'");
     }
-    
-    L->push(::getenv(L->tostring(1).to_charp()));
+
+#ifdef _WIN32
+    char buffer[BUFSIZ + 1];
+    if (GetEnvironmentVariable(L->tostring(1).to_charp(), buffer, BUFSIZ)) {
+        L->push(buffer);
+    } else {
+        L->push();
+    }
+#else
+    char * var = ::getenv(L->tostring(1).to_charp());
+    if (var) {
+        L->push(var);
+    } else {
+        L->push();
+    }
+#endif
     
     return 1;
 }
@@ -352,8 +366,12 @@ int LuaStatics::setenv(lua_State * _L) {
     if (n != 2) {
         L->error("Incorrect arguments to function `setenv'");
     }
-    
+
+#ifdef _WIN32
+    SetEnvironmentVariable(L->tostring(1).to_charp(), L->tostring(2).to_charp());
+#else
     ::setenv(L->tostring(1).to_charp(), L->tostring(2).to_charp(), 1);
+#endif
     
     return 0;
 }
@@ -365,8 +383,12 @@ int LuaStatics::unsetenv(lua_State * _L) {
     if (n != 1) {
         L->error("Incorrect arguments to function `unsetenv'");
     }
-    
+
+#ifdef _WIN32
+    SetEnvironmentVariable(L->tostring(1).to_charp(), NULL);
+#else
     ::unsetenv(L->tostring(1).to_charp());
+#endif
     
     return 0;
 }
-- 
cgit v1.2.3