Re: [PATCH 2/10] splice

[Isaac Dunham <idunham@lavabit.com>]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

This adds a syscall wrapper for splice. 
I trusted git apply too much, so there are two parts to this patch:
one to add the syscall, one to fix the header back up...
Isaac Dunham

[-- Attachment #2: 2-splice.diff --]
[-- Type: text/x-patch, Size: 991 bytes --]

diff --git a/include/fcntl.h b/include/fcntl.h
index fcb622a..b014662 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -9,6 +9,11 @@ extern "C" {
 #define __NEED_pid_t
 #define __NEED_mode_t
 
+#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
+#define __NEED_size_t
+#define __NEED_ssize_t
+#endif
+
 #include <bits/alltypes.h>
 
 #include <bits/fcntl.h>
@@ -97,6 +102,7 @@ int posix_fallocate(int, off_t, off_t);
 #define F_TEST  3
 
 int lockf(int, int, off_t);
+ssize_t splice(int, off_t, int, off_t, size_t, unsigned int);
 #endif
 
 #if defined(_GNU_SOURCE)
diff --git a/src/linux/splice.c b/src/linux/splice.c
new file mode 100644
index 0000000..63e4593
--- /dev/null
+++ b/src/linux/splice.c
@@ -0,0 +1,9 @@
+#define _GNU_SOURCE
+#include <fcntl.h>
+#include <sys/types.h>
+#include "syscall.h"
+
+ssize_t splice(int fd_in, off_t *off_in, int fd_out, off_t *off_out, size_t len, unsigned int flags)
+{
+	return syscall(SYS_splice, fd_in, off_in, fd_out, off_out, len, flags);
+}

[-- Attachment #3: 2.5-splice.diff --]
[-- Type: text/x-patch, Size: 616 bytes --]

diff --git a/include/fcntl.h b/include/fcntl.h
index b014662..27ca147 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -9,7 +9,7 @@ extern "C" {
 #define __NEED_pid_t
 #define __NEED_mode_t
 
+#ifdef _GNU_SOURCE
+#define __NEED_size_t
 #define __NEED_ssize_t
 #endif
@@ -102,10 +102,10 @@ int posix_fallocate(int, off_t, off_t);
 #define F_TEST  3
 
 int lockf(int, int, off_t);
-ssize_t splice(int, off_t, int, off_t, size_t, unsigned int);
 #endif
 
 #if defined(_GNU_SOURCE)
+ssize_t splice(int, off_t, int, off_t, size_t, unsigned int);
 #define F_OWNER_TID 0
 #define F_OWNER_PID 1
 #define F_OWNER_PGRP 2