nixio: added syslog support

diff --git a/libs/nixio/Makefile b/libs/nixio/Makefile
index 228f6e5b6b3aa01aa373907afc699b9ac23e604b..ca22328aef52281b61ab48fe157b88c01549af12 100644 (file)
--- a/libs/nixio/Makefile
+++ b/libs/nixio/Makefile
@@ -9,7 +9,7 @@ NIXIO_TLS    ?= openssl
 NIXIO_LDFLAGS =
 
 NIXIO_OBJ = src/nixio.o src/socket.o src/sockopt.o src/bind.o src/address.o \
-           src/poll.o src/io.o src/file.o src/splice.o src/process.o \
+           src/poll.o src/io.o src/file.o src/splice.o src/process.o src/syslog.o \
            src/tls-context.o src/tls-socket.o
 
 ifeq ($(NIXIO_TLS),axtls)

diff --git a/libs/nixio/src/nixio.c b/libs/nixio/src/nixio.c
index 5e92f14dde538cf1b000fb17a00d3d6f0073a537..3a70aa8dac30a88d583ce1bb9c5d5f36ce1b8bf3 100644 (file)
--- a/libs/nixio/src/nixio.c
+++ b/libs/nixio/src/nixio.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#define VERSION 0.1
+#define VERSION 0.2
 
 
 /* pushes nil, error number and errstring on the stack */
@@ -122,6 +122,7 @@ LUALIB_API int luaopen_nixio(lua_State *L) {
        nixio_open_io(L);
        nixio_open_splice(L);
        nixio_open_process(L);
+       nixio_open_syslog(L);
        nixio_open_tls_context(L);
        nixio_open_tls_socket(L);
 

diff --git a/libs/nixio/src/nixio.h b/libs/nixio/src/nixio.h
index 7aef9a4295c3dfddf3cf473cd3ff34ee19accb46..23da17d440c1ff187d629684a060f1479fe74a22 100644 (file)
--- a/libs/nixio/src/nixio.h
+++ b/libs/nixio/src/nixio.h
@@ -41,6 +41,7 @@ void nixio_open_poll(lua_State *L);
 void nixio_open_io(lua_State *L);
 void nixio_open_splice(lua_State *L);
 void nixio_open_process(lua_State *L);
+void nixio_open_syslog(lua_State *L);
 void nixio_open_tls_context(lua_State *L);
 void nixio_open_tls_socket(lua_State *L);
 

diff --git a/libs/nixio/src/poll.c b/libs/nixio/src/poll.c
index 33cb46964ca0e895a9d23303c1875e7ab90d1428..fdec2caaf0245db5aedba43ca3e9497ada4ebd99 100644 (file)
--- a/libs/nixio/src/poll.c
+++ b/libs/nixio/src/poll.c
@@ -143,9 +143,7 @@ static int nixio_poll(lua_State *L) {
                lua_pop(L, 3);
        }
 
-       do {
-               status = poll(fds, (nfds_t)len, timeout);
-       } while (status == -1 && errno == EINTR);
+       status = poll(fds, (nfds_t)len, timeout);
 
        if (status < 1) {
                free(fds);