libs/nixio: fix uninitialized variable warning on Darwin in splice.c

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

diff --git a/libs/nixio/src/splice.c b/libs/nixio/src/splice.c
index 2b28370..db63ea9 100644 (file)
--- a/libs/nixio/src/splice.c
+++ b/libs/nixio/src/splice.c
@@ -16,49 +16,61 @@
  *  limitations under the License.
  */
 
+#ifdef __linux__
 #define _GNU_SOURCE
+#endif
 
 #include "nixio.h"
 #include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/param.h>
+
+
+#ifndef __WINNT__
+
+#ifndef BSD
 #include <sys/sendfile.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#endif
+
+#ifdef _GNU_SOURCE
+#ifdef SPLICE_F_MOVE
 
 /* guess what sucks... */
 #ifdef __UCLIBC__
 #include <unistd.h>
 #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
 }
-#endif /* __UCLIBC__ */
 
-/**
- * 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);
-}
+#undef SPLICE_F_MOVE
+#undef SPLICE_F_NONBLOCK
+#undef SPLICE_F_MORE
 
-/**
- * Translate integer to poll flags and vice versa
- */
-static int nixio_splice_flags(lua_State *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");
-       lua_pushinteger(L, flags);
+#define SPLICE_F_MOVE 1
+#define SPLICE_F_NONBLOCK 2
+#define SPLICE_F_MORE 4
 
-       return 1;
-}
+#endif /* __UCLIBC__ */
 
 /**
  * splice(fd_in, fd_out, length, flags)
@@ -68,44 +80,106 @@ static int nixio_splice(lua_State *L) {
        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);
        }
 
-       lua_pushnumber(L, spliced);
+       lua_pushinteger(L, spliced);
        return 1;
 }
 
 /**
+ * Translate splice flags to integer
+ */
+static int nixio_splice_flags(lua_State *L) {
+       const int j = lua_gettop(L);
+       int flags = 0;
+       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;
+}
+
+#endif /* SPLICE_F_MOVE */
+#endif /* _GNU_SOURCE */
+
+/**
  * sendfile(outfd, infd, length)
  */
 static int nixio_sendfile(lua_State *L) {
-       int sockfd = nixio__checksockfd(L);
+       int sock = nixio__checksockfd(L);
        int infd = nixio__checkfd(L, 2);
        size_t len = luaL_checkinteger(L, 3);
+       off_t spliced;
 
-       long spliced = sendfile(sockfd, infd, NULL, len);
+#ifndef BSD
+       do {
+               spliced = sendfile(sock, infd, NULL, len);
+       } while (spliced == -1 && errno == EINTR);
 
-       if (spliced < 0) {
+       if (spliced == -1) {
                return nixio__perror(L);
        }
+#else
+       int r;
+       const off_t offset = lseek(infd, 0, SEEK_CUR);
+
+       do {
+#ifdef __DARWIN__
+               r = sendfile(infd, sock, offset, (off_t *)&len, NULL, 0);
+               spliced = r;
+#else
+               r = sendfile(infd, sock, offset, len, NULL, &spliced, 0);
+#endif
+       } while (r == -1 && errno == EINTR);
+
+       if (r == -1) {
+               return nixio__perror(L);
+       }
+#endif
 
-       lua_pushnumber(L, spliced);
+       lua_pushinteger(L, spliced);
        return 1;
 }
 
 /* module table */
 static const luaL_reg R[] = {
+#ifdef _GNU_SOURCE
+#ifdef SPLICE_F_MOVE
        {"splice",                      nixio_splice},
        {"splice_flags",        nixio_splice_flags},
+#endif
+#endif
        {"sendfile",            nixio_sendfile},
        {NULL,                  NULL}
 };
 
+
 void nixio_open_splice(lua_State *L) {
        luaL_register(L, NULL, R);
 }
+
+#else /* __WINNT__ */
+
+void nixio_open_splice(lua_State *L) {
+}
+
+#endif /* !__WINNT__ */