Merge branch 'busybox' into merge

1 files changed, 16 insertions, 5 deletions

diff --git a/findutils/xargs.c b/findutils/xargs.c
index 71350d470..1f8d95168 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -83,9 +83,11 @@
 /* This is a NOEXEC applet. Be very careful! */
 
 
-//#define dbg_msg(...) bb_error_msg(__VA_ARGS__)
-#define dbg_msg(...) ((void)0)
-
+#if 0
+# define dbg_msg(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg_msg(...) ((void)0)
+#endif
 
 #ifdef TEST
 # ifndef ENABLE_FEATURE_XARGS_SUPPORT_CONFIRMATION
@@ -539,9 +541,18 @@ static char* FAST_FUNC process_stdin_with_replace(int n_max_chars, int n_max_arg
 
         while (1) {
                 int c = getchar();
+                if (p == buf) {
+                        if (c == EOF)
+                                goto ret; /* last line is empty, return "" */
+                        if (c == G.eol_ch)
+                                continue; /* empty line, ignore */
+                        /* Skip leading whitespace of each line: try
+                         * echo -e ' \t\v1 2 3 ' | xargs -I% echo '[%]'
+                         */
+                        if (ISSPACE(c))
+                                continue;
+                }
                 if (c == EOF || c == G.eol_ch) {
-                        if (p == buf)
-                                goto ret; /* empty line */
                         c = '\0';
                 }
                 *p++ = c;