Merge branch 'busybox' into merge

Conflicts:
	archival/libarchive/open_transformer.c
	libbb/lineedit.c
	miscutils/man.c

1 files changed, 13 insertions, 0 deletions

diff --git a/Config.in b/Config.in
index 61e4088bf..c6aad4210 100644
--- a/Config.in
+++ b/Config.in
@@ -278,6 +278,19 @@ config PAM
           Use PAM in some busybox applets (currently login and httpd) instead
           of direct access to password database.
 
+config FEATURE_USE_SENDFILE
+        bool "Use sendfile system call"
+        default y
+        select PLATFORM_LINUX
+        help
+          When enabled, busybox will use the kernel sendfile() function
+          instead of read/write loops to copy data between file descriptors
+          (for example, cp command does this a lot).
+          If sendfile() doesn't work, copying code falls back to read/write
+          loop. sendfile() was originally implemented for faster I/O
+          from files to sockets, but since Linux 2.6.33 it was extended
+          to work for many more file types.
+
 config LONG_OPTS
         bool "Support for --long-options"
         default y