Changeset 4322

Timestamp:

03/12/09 15:53:52 (4 years ago)

Author:

Cyrus

Message:

nixio: FreeBSD compatibility #2

Location:

luci/trunk/libs/nixio/src

Files:

• address.c (modified) (1 diff)
• bind.c (modified) (2 diffs)
• file.c (modified) (2 diffs)
• io.c (modified) (1 diff)
• splice.c (modified) (2 diffs)

luci/trunk/libs/nixio/src/address.c

@@ -21 +21 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <string.h>
 #include <netdb.h>

luci/trunk/libs/nixio/src/bind.c

@@ -21 +21 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <sys/un.h>
 #include <string.h>
@@ -26 +27 @@
 #include <netdb.h>
 #include <errno.h>
-#include "nixio.h"
 
 /**

luci/trunk/libs/nixio/src/file.c

@@ -26 +26 @@
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 
@@ -210 +211 @@
 static int nixio_file_sync(lua_State *L) {
     int fd = nixio__checkfd(L, 1);
+#ifndef BSD
     int meta = lua_toboolean(L, 2);
     return nixio__pstatus(L, (meta) ? !fsync(fd) : !fdatasync(fd));
+#else
+    return nixio__pstatus(L, !fsync(fd));
+#endif
 }
 

luci/trunk/libs/nixio/src/io.c

@@ -24 +24 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include "nixio.h"
-
+#include <netinet/in.h>
 
 

luci/trunk/libs/nixio/src/splice.c

@@ -26 +26 @@
 #include <errno.h>
 #include <unistd.h>
+
+#ifndef BSD
 #include <sys/sendfile.h>
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#endif
 
 #ifdef _GNU_SOURCE
@@ -103 +110 @@
  */
 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 {
+        r = sendfile(infd, sock, offset, len, NULL, &spliced, 0);
+    } while (r == -1 && errno == EINTR);
+
+    if (r == -1) {
+        return nixio__perror(L);
+    }
+#endif
 
     lua_pushnumber(L, spliced);