X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fnixio%2Fsrc%2Fnixio.c;h=5e92f14dde538cf1b000fb17a00d3d6f0073a537;hb=ee4852a5ad79452f2ea76e32463a0af91b857752;hp=a4ef7462ef7d18d0cfc68637319b9363750849ac;hpb=cbc49a3b537e2e7cc49166f9d85e730d0f7d6275;p=project%2Fluci.git

diff --git a/libs/nixio/src/nixio.c b/libs/nixio/src/nixio.c
index a4ef7462e..5e92f14dd 100644
--- a/libs/nixio/src/nixio.c
+++ b/libs/nixio/src/nixio.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <signal.h>
 
 #define VERSION 0.1
 
@@ -53,12 +54,6 @@ nixio_sock* nixio__checksock(lua_State *L) {
     return sock;
 }
 
-FILE* nixio__checkfile(lua_State *L) {
-	FILE **fpp = (FILE**)luaL_checkudata(L, 1, NIXIO_FILE_META);
-	luaL_argcheck(L, *fpp, 1, "invalid file object");
-	return *fpp;
-}
-
 /* read fd from nixio_sock object */
 int nixio__checksockfd(lua_State *L) {
 	return nixio__checksock(L)->fd;
@@ -80,7 +75,9 @@ int nixio__tofd(lua_State *L, int ud) {
 		luaL_getmetatable(L, LUA_FILEHANDLE);
 		if (lua_rawequal(L, -3, -4)) {
 			fd = ((nixio_sock*)udata)->fd;
-		} else if (lua_rawequal(L, -2, -4) || lua_rawequal(L, -1, -4)) {
+		} else if (lua_rawequal(L, -2, -4)) {
+			fd = *((int*)udata);
+		} else if (lua_rawequal(L, -1, -4)) {
 			fd = (*((FILE **)udata)) ? fileno(*((FILE **)udata)) : -1;
 		}
 		lua_pop(L, 4);
@@ -88,8 +85,14 @@ int nixio__tofd(lua_State *L, int ud) {
 	return fd;
 }
 
+static int nixio_strerror(lua_State *L) {
+	lua_pushstring(L, strerror(luaL_checkinteger(L, 1)));
+	return 1;
+}
+
 /* object table */
 static const luaL_reg R[] = {
+	{"strerror",	nixio_strerror},
 	{NULL,			NULL}
 };
 
@@ -107,7 +110,7 @@ LUALIB_API int luaopen_nixio(lua_State *L) {
 
 	/* register metatable as socket_meta */
 	lua_pushvalue(L, -2);
-	lua_setfield(L, -2, "socket_meta");
+	lua_setfield(L, -2, "meta_socket");
 
 	/* register methods */
 	nixio_open_file(L);
@@ -118,20 +121,66 @@ LUALIB_API int luaopen_nixio(lua_State *L) {
 	nixio_open_poll(L);
 	nixio_open_io(L);
 	nixio_open_splice(L);
+	nixio_open_process(L);
+	nixio_open_tls_context(L);
+	nixio_open_tls_socket(L);
 
 	/* module version */
 	lua_pushnumber(L, VERSION);
 	lua_setfield(L, -2, "version");
 
 	/* some constants */
-	lua_createtable(L, 0, 1);
+	lua_createtable(L, 0, 49);
 
 	NIXIO_PUSH_CONSTANT(EACCES);
+	NIXIO_PUSH_CONSTANT(EINTR);
 	NIXIO_PUSH_CONSTANT(ENOSYS);
 	NIXIO_PUSH_CONSTANT(EINVAL);
 	NIXIO_PUSH_CONSTANT(EWOULDBLOCK);
 	NIXIO_PUSH_CONSTANT(EAGAIN);
 	NIXIO_PUSH_CONSTANT(ENOMEM);
+	NIXIO_PUSH_CONSTANT(ENOENT);
+	NIXIO_PUSH_CONSTANT(ECHILD);
+	NIXIO_PUSH_CONSTANT(EIO);
+	NIXIO_PUSH_CONSTANT(EBADF);
+	NIXIO_PUSH_CONSTANT(EFAULT);
+	NIXIO_PUSH_CONSTANT(EFBIG);
+	NIXIO_PUSH_CONSTANT(ENOSPC);
+	NIXIO_PUSH_CONSTANT(EPIPE);
+	NIXIO_PUSH_CONSTANT(ESPIPE);
+	NIXIO_PUSH_CONSTANT(EISDIR);
+	NIXIO_PUSH_CONSTANT(EPERM);
+	NIXIO_PUSH_CONSTANT(EEXIST);
+	NIXIO_PUSH_CONSTANT(ELOOP);
+	NIXIO_PUSH_CONSTANT(EMFILE);
+	NIXIO_PUSH_CONSTANT(ENAMETOOLONG);
+	NIXIO_PUSH_CONSTANT(ENFILE);
+	NIXIO_PUSH_CONSTANT(ENODEV);
+	NIXIO_PUSH_CONSTANT(ENOTDIR);
+	NIXIO_PUSH_CONSTANT(ENXIO);
+	NIXIO_PUSH_CONSTANT(EOVERFLOW);
+	NIXIO_PUSH_CONSTANT(EROFS);
+	NIXIO_PUSH_CONSTANT(ETXTBSY);
+	NIXIO_PUSH_CONSTANT(EAFNOSUPPORT);
+	NIXIO_PUSH_CONSTANT(ENOBUFS);
+	NIXIO_PUSH_CONSTANT(EPROTONOSUPPORT);
+	NIXIO_PUSH_CONSTANT(ENOPROTOOPT);
+	NIXIO_PUSH_CONSTANT(EBUSY);
+	NIXIO_PUSH_CONSTANT(ESRCH);
+	NIXIO_PUSH_CONSTANT(SIGALRM);
+	NIXIO_PUSH_CONSTANT(SIGINT);
+	NIXIO_PUSH_CONSTANT(SIGTERM);
+	NIXIO_PUSH_CONSTANT(SIGKILL);
+	NIXIO_PUSH_CONSTANT(SIGHUP);
+	NIXIO_PUSH_CONSTANT(SIGSTOP);
+	NIXIO_PUSH_CONSTANT(SIGCONT);
+	NIXIO_PUSH_CONSTANT(SIGSEGV);
+	NIXIO_PUSH_CONSTANT(SIGCHLD);
+	NIXIO_PUSH_CONSTANT(SIGQUIT);
+	NIXIO_PUSH_CONSTANT(SIGUSR1);
+	NIXIO_PUSH_CONSTANT(SIGUSR2);
+	NIXIO_PUSH_CONSTANT(SIGIO);
+	NIXIO_PUSH_CONSTANT(SIGURG);
 
 	lua_setfield(L, -2, "const");