Merge branch 'busybox' into merge

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

7 files changed, 95 insertions, 37 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 1f2ed36d9..1be87b337 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -189,3 +189,6 @@ lib-$(CONFIG_PGREP) += xregcomp.o
 lib-$(CONFIG_PKILL) += xregcomp.o
 lib-$(CONFIG_DEVFSD) += xregcomp.o
 lib-$(CONFIG_FEATURE_FIND_REGEX) += xregcomp.o
+
+# Add the experimental logging functionality, only used by zcip
+lib-$(CONFIG_ZCIP) += logenv.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 2c85062b4..b74b6e724 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -746,7 +746,8 @@ static int busybox_main(char **argv)
         /*bb_error_msg_and_die("applet not found"); - sucks in printf */
         full_write2_str(applet_name);
         full_write2_str(": applet not found\n");
-        xfunc_die();
+        /* POSIX: "If a command is not found, the exit status shall be 127" */
+        exit(127);
 }
 
 void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
@@ -870,6 +871,7 @@ int main(int argc UNUSED_PARAM, char **argv)
         /*bb_error_msg_and_die("applet not found"); - sucks in printf */
         full_write2_str(applet_name);
         full_write2_str(": applet not found\n");
-        xfunc_die();
+        /* POSIX: "If a command is not found, the exit status shall be 127" */
+        exit(127);
 #endif
 }
diff --git a/libbb/bbunit.c b/libbb/bbunit.c
index 256014441..4c692d59f 100644
--- a/libbb/bbunit.c
+++ b/libbb/bbunit.c
@@ -77,7 +77,7 @@ int unit_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 #if WANT_TIMING
         gettimeofday(&end, NULL);
         timeval_diff(&time_spent, &end, &begin);
-        bb_error_msg("Elapsed time %u.%06u seconds"
+        bb_error_msg("Elapsed time %u.%06u seconds",
                         (int)time_spent.tv_sec,
                         (int)time_spent.tv_usec);
 #endif
diff --git a/libbb/copyfd.c b/libbb/copyfd.c
index eda2747f9..7e3531903 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -8,6 +8,20 @@
  */
 
 #include "libbb.h"
+#if ENABLE_FEATURE_USE_SENDFILE
+# include <sys/sendfile.h>
+#else
+# define sendfile(a,b,c,d) (-1)
+#endif
+
+/*
+ * We were using 0x7fff0000 as sendfile chunk size, but it
+ * was seen to cause largish delays when user tries to ^C a file copy.
+ * Let's use a saner size.
+ * Note: needs to be >= max(CONFIG_FEATURE_COPYBUF_KB),
+ * or else "copy to eof" code will use neddlesly short reads.
+ */
+#define SENDFILE_BIGBUF (16*1024*1024)
 
 /* Used by NOFORK applets (e.g. cat) - must not use xmalloc.
  * size < 0 means "ignore write errors", used by tar --to-command
@@ -18,12 +32,13 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
         int status = -1;
         off_t total = 0;
         bool continue_on_write_error = 0;
-#if CONFIG_FEATURE_COPYBUF_KB <= 4
+        ssize_t sendfile_sz;
+#if CONFIG_FEATURE_COPYBUF_KB > 4
+        char *buffer = buffer; /* for compiler */
+        int buffer_size = 0;
+#else
         char buffer[CONFIG_FEATURE_COPYBUF_KB * 1024];
         enum { buffer_size = sizeof(buffer) };
-#else
-        char *buffer;
-        int buffer_size;
 #endif
 
         if (size < 0) {
@@ -31,46 +46,58 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
                 continue_on_write_error = 1;
         }
 
-#if CONFIG_FEATURE_COPYBUF_KB > 4
-        if (size > 0 && size <= 4 * 1024)
-                goto use_small_buf;
-        /* We want page-aligned buffer, just in case kernel is clever
-         * and can do page-aligned io more efficiently */
-        buffer = mmap(NULL, CONFIG_FEATURE_COPYBUF_KB * 1024,
-                        PROT_READ | PROT_WRITE,
-                        MAP_PRIVATE | MAP_ANON,
-                        /* ignored: */ -1, 0);
-        buffer_size = CONFIG_FEATURE_COPYBUF_KB * 1024;
-        if (buffer == MAP_FAILED) {
- use_small_buf:
-                buffer = alloca(4 * 1024);
-                buffer_size = 4 * 1024;
-        }
-#endif
-
         if (src_fd < 0)
                 goto out;
 
+        sendfile_sz = !ENABLE_FEATURE_USE_SENDFILE
+                ? 0
+                : SENDFILE_BIGBUF;
         if (!size) {
-                size = buffer_size;
+                size = SENDFILE_BIGBUF;
                 status = 1; /* copy until eof */
         }
 
         while (1) {
                 ssize_t rd;
 
-                rd = safe_read(src_fd, buffer, size > buffer_size ? buffer_size : size);
-
-                if (!rd) { /* eof - all done */
-                        status = 0;
-                        break;
+                if (sendfile_sz) {
+                        rd = sendfile(dst_fd, src_fd, NULL,
+                                size > sendfile_sz ? sendfile_sz : size);
+                        if (rd >= 0)
+                                goto read_ok;
+                        sendfile_sz = 0; /* do not try sendfile anymore */
+                }
+#if CONFIG_FEATURE_COPYBUF_KB > 4
+                if (buffer_size == 0) {
+                        if (size > 0 && size <= 4 * 1024)
+                                goto use_small_buf;
+                        /* We want page-aligned buffer, just in case kernel is clever
+                         * and can do page-aligned io more efficiently */
+                        buffer = mmap(NULL, CONFIG_FEATURE_COPYBUF_KB * 1024,
+                                        PROT_READ | PROT_WRITE,
+                                        MAP_PRIVATE | MAP_ANON,
+                                        /* ignored: */ -1, 0);
+                        buffer_size = CONFIG_FEATURE_COPYBUF_KB * 1024;
+                        if (buffer == MAP_FAILED) {
+ use_small_buf:
+                                buffer = alloca(4 * 1024);
+                                buffer_size = 4 * 1024;
+                        }
                 }
+#endif
+                rd = safe_read(src_fd, buffer,
+                        size > buffer_size ? buffer_size : size);
                 if (rd < 0) {
                         bb_perror_msg(bb_msg_read_error);
                         break;
                 }
+ read_ok:
+                if (!rd) { /* eof - all done */
+                        status = 0;
+                        break;
+                }
                 /* dst_fd == -1 is a fake, else... */
-                if (dst_fd >= 0) {
+                if (dst_fd >= 0 && !sendfile_sz) {
                         ssize_t wr = full_write(dst_fd, buffer, rd);
                         if (wr < rd) {
                                 if (!continue_on_write_error) {
@@ -92,10 +119,8 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
         }
  out:
 
-#if CONFIG_FEATURE_COPYBUF_KB > 4
-        if (buffer_size != 4 * 1024)
+        if (buffer_size > 4 * 1024)
                 munmap(buffer, buffer_size);
-#endif
         return status ? -1 : total;
 }
 
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 1f5653cb5..3d96a8e9f 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -2316,10 +2316,14 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         if (!isatty(0) || !isatty(1)) {
 #else
         if (tcgetattr(STDIN_FILENO, &initial_settings) < 0
-         || !(initial_settings.c_lflag & ECHO)
+         || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON
         ) {
 #endif
-                /* Happens when e.g. stty -echo was run before */
+                /* Happens when e.g. stty -echo was run before.
+                 * But if ICANON is not set, we don't come here.
+                 * (example: interactive python ^Z-backgrounded,
+                 * tty is still in "raw mode").
+                 */
                 parse_and_put_prompt(prompt);
                 /* fflush_all(); - done by parse_and_put_prompt */
                 if (fgets(command, maxsize, stdin) == NULL)
diff --git a/libbb/logenv.c b/libbb/logenv.c
new file mode 100644
index 000000000..66c60bd4e
--- /dev/null
+++ b/libbb/logenv.c
@@ -0,0 +1,24 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2014 by Fugro Intersite B.V. <m.stam@fugro.nl>
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+
+void FAST_FUNC bb_logenv_override(void)
+{
+        const char* mode = getenv("LOGGING");
+
+        if (!mode)
+                return;
+
+        if (strcmp(mode, "none") == 0)
+                logmode = LOGMODE_NONE;
+#if ENABLE_FEATURE_SYSLOG
+        else if (strcmp(mode, "syslog") == 0)
+                logmode = LOGMODE_SYSLOG;
+#endif
+}
diff --git a/libbb/sysconf.c b/libbb/sysconf.c
index 031901980..cfad9cdc0 100644
--- a/libbb/sysconf.c
+++ b/libbb/sysconf.c
@@ -8,7 +8,7 @@
  */
 #include "libbb.h"
 
-#if !defined(ARG_MAX) && defined(_SC_ARG_MAX)
+#if !defined(bb_arg_max)
 unsigned FAST_FUNC bb_arg_max(void)
 {
         return sysconf(_SC_ARG_MAX);