brejela
/
lua-ex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20070110T1431-0700

Browse Source
master
mark 20 years ago
parent 8d084e7338
commit 4bf9e1f5c2
7 changed files with 144 additions and 105 deletions
Show Stats Download Patch File Download Diff File

10
Changelog
Unescape Escape View File

@ -1,3 +1,13 @@
ex-20070110T1431-0700
* new API for os.sleep
ex-20070109T1403-0700
* fixed build scripts
* include Copyright notice
ex-20070109 ex-20070109
API changes API changes

7
INSTALL
Unescape Escape View File

@ -0,0 +1,7 @@
Copy or rename conf.in to conf and edit it appropriately.
Then, use one of the following commands to build:
make mingw
make cygwin
make linux

2
Makefile
Unescape Escape View File

@ -1,4 +1,4 @@
default:; @echo Choose a platform: mingw cygwin linux default:; @cat INSTALL
all: mingw cygwin all: mingw cygwin
mingw:; $(MAKE) -C w32api ex.dll mingw:; $(MAKE) -C w32api ex.dll

5
README
Unescape Escape View File

@ -7,9 +7,6 @@ os.getenv(name) -- get environment variable
os.setenv(name, value) -- set/unset environment variable os.setenv(name, value) -- set/unset environment variable
os.environ() -- returns a copy of the environment os.environ() -- returns a copy of the environment
-- Miscellaneous
os.sleep(seconds) -- sleep for (floating) seconds
-- File system -- File system
cwd = os.currentdir() cwd = os.currentdir()
os.chdir(pathname) os.chdir(pathname)
@ -32,5 +29,7 @@ file:unlock(start, length) -- start and length are optional
in, out = io.pipe() in, out = io.pipe()
-- Process control -- Process control
os.sleep(seconds) -- sleep for (floating-point) seconds
os.sleep(interval, unit) -- sleep for interval/unit seconds
pid = os.spawn(filename, {args={}, env={}, stdin=file, stdout=file, stderr=file}) pid = os.spawn(filename, {args={}, env={}, stdin=file, stdout=file, stderr=file})
exitcode = pid:wait(pid) exitcode = pid:wait(pid)

0
conf → conf.in
Unescape Escape View File

114
posix/ex.c
Unescape Escape View File

@ -14,6 +14,7 @@ ENVIRON_DECL
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <limits.h>
#include "lua.h" #include "lua.h"
#include "lualib.h" #include "lualib.h"
@ -23,7 +24,6 @@ ENVIRON_DECL
#include "spawn.h" #include "spawn.h"
/* -- nil error */ /* -- nil error */
extern int push_error(lua_State *L) extern int push_error(lua_State *L)
{ {
@ -72,15 +72,16 @@ static int ex_environ(lua_State *L)
} }
/* seconds -- */ /* -- pathname/nil error */
static int ex_sleep(lua_State *L) static int ex_currentdir(lua_State *L)
{ {
lua_Number seconds = luaL_checknumber(L, 1); char pathname[PATH_MAX + 1];
usleep(1e6 * seconds); if (!getcwd(pathname, sizeof pathname))
return 0; return push_error(L);
lua_pushstring(L, pathname);
return 1;
} }
/* pathname -- true/nil error */ /* pathname -- true/nil error */
static int ex_chdir(lua_State *L) static int ex_chdir(lua_State *L)
{ {
@ -101,15 +102,18 @@ static int ex_mkdir(lua_State *L)
return 1; return 1;
} }
/* -- pathname/nil error */ /* os.remove provides the correct semantics on POSIX systems */
static int ex_currentdir(lua_State *L) #if 0
/* pathname -- true/nil error */
static int ex_remove(lua_State *L)
{ {
char pathname[PATH_MAX + 1]; const char *pathname = luaL_checkstring(L, 1);
if (!getcwd(pathname, sizeof pathname)) if (-1 == remove(pathname))
return push_error(L); return push_error(L);
lua_pushstring(L, pathname); lua_pushboolean(L, 1);
return 1; return 1;
} }
#endif
static FILE *check_file(lua_State *L, int idx, const char *argname) static FILE *check_file(lua_State *L, int idx, const char *argname)
@ -318,6 +322,17 @@ static int ex_pipe(lua_State *L)
} }
/* seconds --
* interval units -- */
static int ex_sleep(lua_State *L)
{
lua_Number interval = luaL_checknumber(L, 1);
lua_Number units = luaL_optnumber(L, 2, 1);
usleep(1e6 * interval / units);
return 0;
}
static void get_redirect(lua_State *L, int idx, const char *stdname, struct spawn_params *p) static void get_redirect(lua_State *L, int idx, const char *stdname, struct spawn_params *p)
{ {
lua_getfield(L, idx, stdname); lua_getfield(L, idx, stdname);
@ -406,8 +421,9 @@ static int ex_spawn(lua_State *L)
} }
/* copy the fields given in 'l' from one table to another; insert missing fields */ /* register functions from 'lib' in table 'to' by copying existing
static void copy_fields(lua_State *L, const luaL_reg *l, int from, int to) * closures from table 'from' or by creating new closures */
static void copyfields(lua_State *L, const luaL_reg *l, int from, int to)
{ {
for (to = absindex(L, to); l->name; l++) { for (to = absindex(L, to); l->name; l++) {
lua_getfield(L, from, l->name); lua_getfield(L, from, l->name);
@ -423,8 +439,7 @@ int luaopen_ex(lua_State *L)
{ {
const luaL_reg ex_iolib[] = { const luaL_reg ex_iolib[] = {
{"pipe", ex_pipe}, {"pipe", ex_pipe},
{0,0} }; #define ex_iofile_methods (ex_iolib + 1)
const luaL_reg ex_iofile_methods[] = {
{"lock", ex_lock}, {"lock", ex_lock},
{"unlock", ex_unlock}, {"unlock", ex_unlock},
{0,0} }; {0,0} };
@ -433,62 +448,67 @@ int luaopen_ex(lua_State *L)
{"setenv", ex_setenv}, {"setenv", ex_setenv},
{"environ", ex_environ}, {"environ", ex_environ},
{"sleep", ex_sleep}, {"currentdir", ex_currentdir},
{"chdir", ex_chdir}, {"chdir", ex_chdir},
{"mkdir", ex_mkdir}, {"mkdir", ex_mkdir},
{"currentdir", ex_currentdir}, #if 0
{"remove", ex_remove},
#endif
{"dir", ex_dir}, {"dir", ex_dir},
{"dirent", ex_dirent}, {"dirent", ex_dirent},
{"sleep", ex_sleep},
{"spawn", ex_spawn}, {"spawn", ex_spawn},
{0,0} }; {0,0} };
const luaL_reg ex_diriter_methods[] = { const luaL_reg ex_diriter_methods[] = {
{"__gc", diriter_close}, {"__gc", diriter_close},
/* {"__tostring", diriter_tostring}, */
{0,0} }; {0,0} };
const luaL_reg ex_process_methods[] = { const luaL_reg ex_process_methods[] = {
{"__tostring", process_tostring}, {"__tostring", process_tostring},
#define ex_process_functions (ex_process_methods + 1)
{"wait", process_wait}, {"wait", process_wait},
{0,0} }; {0,0} };
/* Make all functions available via ex. namespace */ int ex;
luaL_register(L, "ex", ex_iolib); /* . ex */ const char *name = lua_tostring(L, 1);
luaL_register(L, 0, ex_oslib);
luaL_register(L, 0, ex_iofile_methods); /* diriter metatable */
luaL_register(L, 0, ex_process_methods + 1); /* XXX don't insert __tostring */ luaL_newmetatable(L, DIR_HANDLE); /* . D */
lua_replace(L, 1); /* ex . */ luaL_register(L, 0, ex_diriter_methods); /* . D */
/* proc metatable */
luaL_newmetatable(L, PROCESS_HANDLE); /* . P */
luaL_register(L, 0, ex_process_methods); /* . P */
lua_pushvalue(L, -1); /* . P P */
lua_setfield(L, -2, "__index"); /* . P */
/* make all functions available via ex. namespace */
luaL_register(L, name, ex_oslib); /* . P ex */
luaL_register(L, 0, ex_iolib);
copyfields(L, ex_process_functions, -2, -1);
ex = lua_gettop(L);
/* extend the os table */ /* extend the os table */
lua_getglobal(L, "os"); /* ex . os */ lua_getglobal(L, "os"); /* . os */
if (lua_isnil(L, -1)) return luaL_error(L, "os not loaded"); if (lua_isnil(L, -1)) return luaL_error(L, "os not loaded");
copy_fields(L, ex_oslib, 1, -1); /* ex . os */ copyfields(L, ex_oslib, ex, -1);
lua_getfield(L, -1, "remove");
lua_setfield(L, ex, "remove");
/* extend the io table */ /* extend the io table */
lua_getglobal(L, "io"); /* ex . io */ lua_getglobal(L, "io"); /* . io */
if (lua_isnil(L, -1)) return luaL_error(L, "io not loaded"); if (lua_isnil(L, -1)) return luaL_error(L, "io not loaded");
copy_fields(L, ex_iolib, 1, -1); /* ex . io */ copyfields(L, ex_iolib, ex, -1);
copy_fields(L, ex_iofile_methods, 1, -1); /* ex . io */ lua_getfield(L, ex, "pipe"); /* . io ex_pipe */
lua_getfield(L, 1, "pipe"); /* ex . io ex_pipe */ lua_getfield(L, -2, "stderr"); /* . io ex_pipe io_stderr */
lua_getfield(L, -2, "stderr"); /* ex . io ex_pipe io_stderr */ lua_getfenv(L, -1); /* . io ex_pipe io_stderr E */
lua_getfenv(L, -1); /* ex . io ex_pipe io_stderr E */ lua_setfenv(L, -3); /* . io ex_pipe io_stderr */
lua_setfenv(L, -3); /* ex . io ex_pipe io_stderr */
/* extend the io.file metatable */ /* extend the io.file metatable */
luaL_getmetatable(L, LUA_FILEHANDLE); /* ex . F */ luaL_getmetatable(L, LUA_FILEHANDLE); /* . F */
if (lua_isnil(L, -1)) return luaL_error(L, "can't find FILE* metatable"); if (lua_isnil(L, -1)) return luaL_error(L, "can't find FILE* metatable");
copy_fields(L, ex_iofile_methods, 1, -1); /* ex . F */ copyfields(L, ex_iofile_methods, ex, -1);
/* diriter metatable */
luaL_newmetatable(L, DIR_HANDLE); /* ex . D */
luaL_register(L, 0, ex_diriter_methods); /* ex . D */
/* proc metatable */
luaL_newmetatable(L, PROCESS_HANDLE); /* ex . P */
copy_fields(L, ex_process_methods, 1, -1); /* ex . P */
lua_setfield(L, -1, "__index"); /* ex . P */
lua_settop(L, 1); /* ex */
return 1; return 1;
} }

111
w32api/ex.c
Unescape Escape View File

@ -26,7 +26,6 @@
#define push_error(L) windows_pushlasterror(L) #define push_error(L) windows_pushlasterror(L)
/* name -- value/nil */ /* name -- value/nil */
static int ex_getenv(lua_State *L) static int ex_getenv(lua_State *L)
{ {
@ -73,15 +72,16 @@ static int ex_environ(lua_State *L)
} }
/* seconds -- */ /* -- pathname/nil error */
static int ex_sleep(lua_State *L) static int ex_currentdir(lua_State *L)
{ {
lua_Number seconds = luaL_checknumber(L, 1); char pathname[MAX_PATH + 1];
Sleep(1e3 * seconds); size_t len = GetCurrentDirectory(sizeof pathname, pathname);
return 0; if (len == 0) return push_error(L);
lua_pushlstring(L, pathname, len);
return 1;
} }
/* pathname -- true/nil error */ /* pathname -- true/nil error */
static int ex_chdir(lua_State *L) static int ex_chdir(lua_State *L)
{ {
@ -102,16 +102,6 @@ static int ex_mkdir(lua_State *L)
return 1; return 1;
} }
/* -- pathname/nil error */
static int ex_currentdir(lua_State *L)
{
char pathname[MAX_PATH + 1];
size_t len = GetCurrentDirectory(sizeof pathname, pathname);
if (len == 0) return push_error(L);
lua_pushlstring(L, pathname, len);
return 1;
}
/* pathname -- true/nil error */ /* pathname -- true/nil error */
static int ex_remove(lua_State *L) static int ex_remove(lua_State *L)
{ {
@ -254,8 +244,10 @@ static int diriter_setpathname(lua_State *L, int index)
static int diriter_close(lua_State *L) static int diriter_close(lua_State *L)
{ {
DIR **pd = lua_touserdata(L, 1); DIR **pd = lua_touserdata(L, 1);
closedir(*pd); if (*pd) {
*pd = 0; closedir(*pd);
*pd = 0;
}
lua_pushnil(L); lua_pushnil(L);
diriter_setpathname(L, 1); diriter_setpathname(L, 1);
return 0; return 0;
@ -363,6 +355,17 @@ static int ex_pipe(lua_State *L)
} }
/* seconds --
* interval units -- */
static int ex_sleep(lua_State *L)
{
lua_Number interval = luaL_checknumber(L, 1);
lua_Number units = luaL_optnumber(L, 2, 1);
Sleep(1e3 * interval / units);
return 0;
}
static void get_redirect(lua_State *L, int idx, const char *stdname, struct spawn_params *p) static void get_redirect(lua_State *L, int idx, const char *stdname, struct spawn_params *p)
{ {
lua_getfield(L, idx, stdname); lua_getfield(L, idx, stdname);
@ -451,8 +454,9 @@ static int ex_spawn(lua_State *L)
} }
/* copy the fields given in 'l' from one table to another; insert missing fields */ /* register functions from 'lib' in table 'to' by copying existing
static void copy_fields(lua_State *L, const luaL_reg *l, int from, int to) * closures from table 'from' or by creating new closures */
static void copyfields(lua_State *L, const luaL_reg *l, int from, int to)
{ {
for (to = absindex(L, to); l->name; l++) { for (to = absindex(L, to); l->name; l++) {
lua_getfield(L, from, l->name); lua_getfield(L, from, l->name);
@ -468,8 +472,7 @@ int luaopen_ex(lua_State *L)
{ {
const luaL_reg ex_iolib[] = { const luaL_reg ex_iolib[] = {
{"pipe", ex_pipe}, {"pipe", ex_pipe},
{0,0} }; #define ex_iofile_methods (ex_iolib + 1)
const luaL_reg ex_iofile_methods[] = {
{"lock", ex_lock}, {"lock", ex_lock},
{"unlock", ex_unlock}, {"unlock", ex_unlock},
{0,0} }; {0,0} };
@ -478,63 +481,63 @@ int luaopen_ex(lua_State *L)
{"setenv", ex_setenv}, {"setenv", ex_setenv},
{"environ", ex_environ}, {"environ", ex_environ},
{"sleep", ex_sleep}, {"currentdir", ex_currentdir},
{"chdir", ex_chdir}, {"chdir", ex_chdir},
{"mkdir", ex_mkdir}, {"mkdir", ex_mkdir},
{"currentdir", ex_currentdir},
{"remove", ex_remove}, {"remove", ex_remove},
{"dir", ex_dir}, {"dir", ex_dir},
{"dirent", ex_dirent}, {"dirent", ex_dirent},
{"sleep", ex_sleep},
{"spawn", ex_spawn}, {"spawn", ex_spawn},
{0,0} }; {0,0} };
const luaL_reg ex_diriter_methods[] = { const luaL_reg ex_diriter_methods[] = {
{"__gc", diriter_close}, {"__gc", diriter_close},
/* {"__tostring", diriter_tostring}, */
{0,0} }; {0,0} };
const luaL_reg ex_process_methods[] = { const luaL_reg ex_process_methods[] = {
{"__tostring", process_tostring}, {"__tostring", process_tostring},
#define ex_process_functions (ex_process_methods + 1)
{"wait", process_wait}, {"wait", process_wait},
{0,0} }; {0,0} };
/* Make all functions available via ex. namespace */ int ex;
luaL_register(L, "ex", ex_iolib); /* . ex */ const char *name = lua_tostring(L, 1);
luaL_register(L, 0, ex_oslib);
luaL_register(L, 0, ex_iofile_methods); /* diriter metatable */
luaL_register(L, 0, ex_process_methods + 1); /* XXX don't insert __tostring */ luaL_newmetatable(L, DIR_HANDLE); /* . D */
lua_replace(L, 1); /* ex . */ luaL_register(L, 0, ex_diriter_methods); /* . D */
/* proc metatable */
luaL_newmetatable(L, PROCESS_HANDLE); /* . P */
luaL_register(L, 0, ex_process_methods); /* . P */
lua_pushvalue(L, -1); /* . P P */
lua_setfield(L, -2, "__index"); /* . P */
/* make all functions available via ex. namespace */
luaL_register(L, name, ex_oslib); /* . P ex */
luaL_register(L, 0, ex_iolib);
copyfields(L, ex_process_functions, -2, -1);
ex = lua_gettop(L);
/* extend the os table */ /* extend the os table */
lua_getglobal(L, "os"); /* ex . os */ lua_getglobal(L, "os"); /* . os */
if (lua_isnil(L, -1)) return luaL_error(L, "os not loaded"); if (lua_isnil(L, -1)) return luaL_error(L, "os not loaded");
copy_fields(L, ex_oslib, 1, -1); /* ex . os */ copyfields(L, ex_oslib, ex, -1);
/* extend the io table */ /* extend the io table */
lua_getglobal(L, "io"); /* ex . io */ lua_getglobal(L, "io"); /* . io */
if (lua_isnil(L, -1)) return luaL_error(L, "io not loaded"); if (lua_isnil(L, -1)) return luaL_error(L, "io not loaded");
copy_fields(L, ex_iolib, 1, -1); /* ex . io */ copyfields(L, ex_iolib, ex, -1);
copy_fields(L, ex_iofile_methods, 1, -1); /* ex . io */ lua_getfield(L, ex, "pipe"); /* . io ex_pipe */
lua_getfield(L, 1, "pipe"); /* ex . io ex_pipe */ lua_getfield(L, -2, "stderr"); /* . io ex_pipe io_stderr */
lua_getfield(L, -2, "stderr"); /* ex . io ex_pipe io_stderr */ lua_getfenv(L, -1); /* . io ex_pipe io_stderr E */
lua_getfenv(L, -1); /* ex . io ex_pipe io_stderr E */ lua_setfenv(L, -3); /* . io ex_pipe io_stderr */
lua_setfenv(L, -3); /* ex . io ex_pipe io_stderr */
/* extend the io.file metatable */ /* extend the io.file metatable */
luaL_getmetatable(L, LUA_FILEHANDLE); /* ex . F */ luaL_getmetatable(L, LUA_FILEHANDLE); /* . F */
if (lua_isnil(L, -1)) return luaL_error(L, "can't find FILE* metatable"); if (lua_isnil(L, -1)) return luaL_error(L, "can't find FILE* metatable");
copy_fields(L, ex_iofile_methods, 1, -1); /* ex . F */ copyfields(L, ex_iofile_methods, ex, -1);
/* diriter metatable */
luaL_newmetatable(L, DIR_HANDLE); /* ex . D */
luaL_register(L, 0, ex_diriter_methods); /* ex . D */
/* proc metatable */
luaL_newmetatable(L, PROCESS_HANDLE); /* ex . P */
copy_fields(L, ex_process_methods, 1, -1); /* ex . P */
lua_setfield(L, -1, "__index"); /* ex . P */
lua_settop(L, 1); /* ex */
return 1; return 1;
} }

Write Preview
Loading…
Cancel
Save