libs/sys: use 100ms timeouts for name resolution of host hints

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

diff --git a/libs/nixio/src/splice.c b/libs/nixio/src/splice.c
index db215efb1666a7d561f175c7df08342e3f9388ef..db63ea9a896c8ed5ed5d2e94b75810c11aaccadd 100644 (file)
--- a/libs/nixio/src/splice.c
+++ b/libs/nixio/src/splice.c
@@ -39,11 +39,13 @@
 #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
@@ -59,6 +61,15 @@ ssize_t splice(int __fdin, __off64_t *__offin, int __fdout,
        return -1;
 #endif
 }
+
+#undef SPLICE_F_MOVE
+#undef SPLICE_F_NONBLOCK
+#undef SPLICE_F_MORE
+
+#define SPLICE_F_MOVE 1
+#define SPLICE_F_NONBLOCK 2
+#define SPLICE_F_MORE 4
+
 #endif /* __UCLIBC__ */
 
 /**
@@ -79,7 +90,7 @@ static int nixio_splice(lua_State *L) {
                return nixio__perror(L);
        }
 
-       lua_pushnumber(L, spliced);
+       lua_pushinteger(L, spliced);
        return 1;
 }
 
@@ -107,6 +118,7 @@ static int nixio_splice_flags(lua_State *L) {
        return 1;
 }
 
+#endif /* SPLICE_F_MOVE */
 #endif /* _GNU_SOURCE */
 
 /**
@@ -131,7 +143,12 @@ static int nixio_sendfile(lua_State *L) {
        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) {
@@ -139,15 +156,17 @@ static int nixio_sendfile(lua_State *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}