More splicing stuff

[project/luci.git] / libs / nixio / src / splice.c

diff --git a/libs/nixio/src/splice.c b/libs/nixio/src/splice.c
index 3784975..cbfc674 100644 (file)
--- a/libs/nixio/src/splice.c
+++ b/libs/nixio/src/splice.c
@@ -20,6 +20,10 @@
 
 #include "nixio.h"
 #include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/sendfile.h>
 
 /* guess what sucks... */
 #ifdef __UCLIBC__
@@ -27,47 +31,58 @@
 #include <sys/syscall.h>
 ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
         __off64_t *__offout, size_t __len, unsigned int __flags) {
+#ifdef __NR_splice
        return syscall(__NR_splice, __fdin, __offin, __fdout, __offout, __len, __flags);
-}
+#else
+       (void)__fdin;
+       (void)__offin;
+       (void)__fdout;
+       (void)__offout;
+       (void)__len;
+       (void)__flags;
+       errno = ENOSYS;
+       return -1;
 #endif
-
-
-/**
- * Checks whether a flag is set in the table and translates it into a bitmap
- */
-static void nixio_splice_flags__w(lua_State *L, int *m, int f, const char *t) {
-       lua_pushstring(L, t);
-       lua_rawget(L, -2);
-       if (lua_toboolean(L, -1)) {
-               *m |= f;
-       }
-       lua_pop(L, 1);
 }
+#endif /* __UCLIBC__ */
 
 /**
- * Translate integer to poll flags and vice versa
+ * Translate splice flags to integer
  */
 static int nixio_splice_flags(lua_State *L) {
+       const int j = lua_gettop(L);
        int flags = 0;
-
-       luaL_checktype(L, 1, LUA_TTABLE);
-       lua_settop(L, 1);
-       nixio_splice_flags__w(L, &flags, SPLICE_F_MOVE, "move");
-       nixio_splice_flags__w(L, &flags, SPLICE_F_NONBLOCK, "nonblock");
-       nixio_splice_flags__w(L, &flags, SPLICE_F_MORE, "more");
+       for (int i=1; i<=j; i++) {
+               const char *flag = luaL_checkstring(L, i);
+               if (!strcmp(flag, "move")) {
+                       flags |= SPLICE_F_MOVE;
+               } else if (!strcmp(flag, "nonblock")) {
+                       flags |= SPLICE_F_NONBLOCK;
+               } else if (!strcmp(flag, "more")) {
+                       flags |= SPLICE_F_MORE;
+               } else {
+                       return luaL_argerror(L, i, "supported values: "
+                        "move, nonblock, more");
+               }
+       }
        lua_pushinteger(L, flags);
 
        return 1;
 }
 
+/**
+ * splice(fd_in, fd_out, length, flags)
+ */
 static int nixio_splice(lua_State *L) {
        int fd_in = nixio__checkfd(L, 1);
        int fd_out = nixio__checkfd(L, 2);
        size_t len = luaL_checkinteger(L, 3);
        int flags = luaL_optinteger(L, 4, 0);
+       long spliced;
 
-
-       long spliced = splice(fd_in, NULL, fd_out, NULL, len, flags);
+       do {
+               spliced = splice(fd_in, NULL, fd_out, NULL, len, flags);
+       } while (spliced == -1 && errno == EINTR);
 
        if (spliced < 0) {
                return nixio__perror(L);
@@ -77,12 +92,36 @@ static int nixio_splice(lua_State *L) {
        return 1;
 }
 
+static int nixio_splice_avail(lua_State *L) {
+       splice(-1, 0, -1, 0, 0, 0);
+       lua_pushboolean(L, errno != ENOSYS);
+       return 1;
+}
+
+/**
+ * sendfile(outfd, infd, length)
+ */
+static int nixio_sendfile(lua_State *L) {
+       int sockfd = nixio__checksockfd(L);
+       int infd = nixio__checkfd(L, 2);
+       size_t len = luaL_checkinteger(L, 3);
+
+       long spliced = sendfile(sockfd, infd, NULL, len);
 
+       if (spliced < 0) {
+               return nixio__perror(L);
+       }
+
+       lua_pushnumber(L, spliced);
+       return 1;
+}
 
 /* module table */
 static const luaL_reg R[] = {
        {"splice",                      nixio_splice},
        {"splice_flags",        nixio_splice_flags},
+       {"splice_avail",        nixio_splice_avail},
+       {"sendfile",            nixio_sendfile},
        {NULL,                  NULL}
 };