From 452442d1d05983fd0e9437f2c16fa22e1d67a947 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 16 Mar 2009 13:28:47 +0000 Subject: [PATCH] nixio: added syslog support --- libs/nixio/Makefile | 2 +- libs/nixio/src/nixio.c | 3 ++- libs/nixio/src/nixio.h | 1 + libs/nixio/src/poll.c | 4 +--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/nixio/Makefile b/libs/nixio/Makefile index 228f6e5b6..ca22328ae 100644 --- 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 5e92f14dd..3a70aa8da 100644 --- a/libs/nixio/src/nixio.c +++ b/libs/nixio/src/nixio.c @@ -22,7 +22,7 @@ #include #include -#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 7aef9a429..23da17d44 100644 --- 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 33cb46964..fdec2caaf 100644 --- 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); -- 2.11.0