From 0abc74ed14ff072d5879b9e053e44105964e9be6 Mon Sep 17 00:00:00 2001
From: mark <mark>
Date: Sun, 29 Jan 2006 07:00:04 +0000
Subject: [PATCH] *** empty log message ***

---
 Makefile                 |  4 +++-
 environ.lua              | 39 ---------------------------------------
 sleep.c                  |  2 --
 rt1.lua => tests/rt1.lua |  3 ++-
 rt2.lua => tests/rt2.lua |  0
 rt3.lua => tests/rt3.lua |  0
 rt4.lua => tests/rt4.lua |  0
 rt5.lua => tests/rt5.lua |  0
 w32api/leak1.c           | 29 -----------------------------
 9 files changed, 5 insertions(+), 72 deletions(-)
 delete mode 100755 environ.lua
 delete mode 100755 sleep.c
 rename rt1.lua => tests/rt1.lua (79%)
 rename rt2.lua => tests/rt2.lua (100%)
 rename rt3.lua => tests/rt3.lua (100%)
 rename rt4.lua => tests/rt4.lua (100%)
 rename rt5.lua => tests/rt5.lua (100%)
 delete mode 100755 w32api/leak1.c

diff --git a/Makefile b/Makefile
index 4f3d57e..21005e6 100755
--- a/Makefile
+++ b/Makefile
@@ -2,4 +2,6 @@ CFLAGS = $(WARNINGS) $(DEFINES) $(INCLUDES)
 DEFINES = -D_XOPEN_SOURCE=600
 INCLUDES = -I${LUA}/src
 WARNINGS = -W -Wall
-LUA = /home/mark/src/lang/lua/lua-5.0.2
+LUA = /home/mark/src/lang/lua/lua-5.1-rc1
+
+lu.so: lu.o; $(CC) -shared -o $@ lu.o
diff --git a/environ.lua b/environ.lua
deleted file mode 100755
index 1eec96f..0000000
--- a/environ.lua
+++ /dev/null
@@ -1,39 +0,0 @@
-local getmetatable, setmetatable = getmetatable, setmetatable
-local rawget, rawset, type = rawget, rawset, type
-local getenv, setenv, unsetenv = os.getenv, os.setenv, os.unsetenv
-
-local mt = getmetatable(os)
-if not mt then
-	mt = {}
-	setmetatable(os, mt)
-end
-module "os"
-
--- metatable for os
-function mt:__index(k)
-	if k == "environ" then
-		local environ = {}
-		-- This function needs to be written in C.
-		for k,v in getenvs() do
-			e[k] = v
-		end
-		rawset(os, "environ", environ)
-	end
-end
-
--- metatable for os.environ
-mt = {}
-function mt:__newindex(name, value)
-	if type(name) ~= "string" then
-		error("Expected a string key", 2)
-	end
-	if value == nil then
-		unsetenv(name)
-	elseif typeof(value) == "string" then
-		setenv(name, value, true)
-	else
-		error("Expected a string value", 2)
-	end
-	rawset(self,name,value)
-end
-environ = setmetatable({}, e)
diff --git a/sleep.c b/sleep.c
deleted file mode 100755
index 10b222c..0000000
--- a/sleep.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <stdio.h>
-
diff --git a/rt1.lua b/tests/rt1.lua
similarity index 79%
rename from rt1.lua
rename to tests/rt1.lua
index 955cbbc..70d920d 100755
--- a/rt1.lua
+++ b/tests/rt1.lua
@@ -4,10 +4,11 @@ require "ex"
 --print"os.sleep"
 --os.sleep(2);
 
-print"os.setenv"
 assert(os.setenv("foo", "42"))
+print("expect foo= 42")
 print("foo=", os.getenv("foo"))
 assert(os.unsetenv("foo"))
+print("expect foo= nil")
 print("foo=", os.getenv("foo"))
 
 
diff --git a/rt2.lua b/tests/rt2.lua
similarity index 100%
rename from rt2.lua
rename to tests/rt2.lua
diff --git a/rt3.lua b/tests/rt3.lua
similarity index 100%
rename from rt3.lua
rename to tests/rt3.lua
diff --git a/rt4.lua b/tests/rt4.lua
similarity index 100%
rename from rt4.lua
rename to tests/rt4.lua
diff --git a/rt5.lua b/tests/rt5.lua
similarity index 100%
rename from rt5.lua
rename to tests/rt5.lua
diff --git a/w32api/leak1.c b/w32api/leak1.c
deleted file mode 100755
index 4160104..0000000
--- a/w32api/leak1.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-#include <windows.h>
-#include <io.h>
-#include <fcntl.h>
-
-int main(void)
-{
-	HANDLE h;
-	FILE *f;
-	h = CreateFile("NUL", GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
-	assert(h != INVALID_HANDLE_VALUE);
-	f = _fdopen(_open_osfhandle(h, _O_RDONLY), "r");
-	assert(f != 0);
-	assert(fgetc(f) == EOF);
-    fclose(f);
-#if 0
-	{
-		char buf[20];
-		DWORD len;
-		fprintf(stderr, "read: %d\n", ReadFile(h, buf, sizeof buf, &len, 0));
-		fprintf(stderr, "error: %lu\n", GetLastError());
-		fprintf(stderr, "len: %lu\n", len);
-	}
-#endif
-	fprintf(stderr, "%d\n", CloseHandle(h));
-	fprintf(stderr, "error: %lu\n", GetLastError());
-    return 0;
-}