Merge branch 'busybox' into merge

3 files changed, 36 insertions, 26 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 121f8fd03..f26c01c1e 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -889,10 +889,10 @@ ACTF(links)
 }
 #endif
 
-static int FAST_FUNC fileAction(const char *fileName,
-                struct stat *statbuf,
-                void *userData UNUSED_PARAM,
-                int depth IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM))
+static int FAST_FUNC fileAction(
+                struct recursive_state *state IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM),
+                const char *fileName,
+                struct stat *statbuf)
 {
         int r;
         int same_fs = 1;
@@ -911,12 +911,12 @@ static int FAST_FUNC fileAction(const char *fileName,
 #endif
 
 #if ENABLE_FEATURE_FIND_MAXDEPTH
-        if (depth < G.minmaxdepth[0]) {
+        if (state->depth < G.minmaxdepth[0]) {
                 if (same_fs)
                         return TRUE; /* skip this, continue recursing */
                 return SKIP; /* stop recursing */
         }
-        if (depth > G.minmaxdepth[1])
+        if (state->depth > G.minmaxdepth[1])
                 return SKIP; /* stop recursing */
 #endif
 
@@ -927,7 +927,7 @@ static int FAST_FUNC fileAction(const char *fileName,
 
 #if ENABLE_FEATURE_FIND_MAXDEPTH
         if (S_ISDIR(statbuf->st_mode)) {
-                if (depth == G.minmaxdepth[1])
+                if (state->depth == G.minmaxdepth[1])
                         return SKIP;
         }
 #endif
@@ -1574,8 +1574,7 @@ int find_main(int argc UNUSED_PARAM, char **argv)
                                 G.recurse_flags,/* flags */
                                 fileAction,     /* file action */
                                 fileAction,     /* dir action */
-                                NULL,           /* user data */
-                                0)              /* depth */
+                                NULL)           /* user data */
                 ) {
                         G.exitstatus |= EXIT_FAILURE;
                 }
diff --git a/findutils/grep.c b/findutils/grep.c
index b456ed467..10cca83e7 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -656,10 +656,9 @@ static void load_pattern_list(llist_t **lst, char *pattern)
                 llist_add_to(lst, new_grep_list_data(p, 0));
 }
 
-static int FAST_FUNC file_action_grep(const char *filename,
-                        struct stat *statbuf,
-                        void* matched,
-                        int depth UNUSED_PARAM)
+static int FAST_FUNC file_action_grep(struct recursive_state *state UNUSED_PARAM,
+                const char *filename,
+                struct stat *statbuf)
 {
         FILE *file;
 
@@ -686,7 +685,7 @@ static int FAST_FUNC file_action_grep(const char *filename,
                 return 0;
         }
         cur_file = filename;
-        *(int*)matched |= grep_file(file);
+        *(int*)state->userData |= grep_file(file);
         fclose(file);
         return 1;
 }
@@ -694,15 +693,16 @@ static int FAST_FUNC file_action_grep(const char *filename,
 static int grep_dir(const char *dir)
 {
         int matched = 0;
-        recursive_action(dir,
-                /* recurse=yes */ ACTION_RECURSE |
-                /* followLinks=always */ ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0) |
-                /* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 |
-                /* depthFirst=yes */ ACTION_DEPTHFIRST,
+        recursive_action(dir, 0
+                | ACTION_RECURSE
+                | ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0)
+                | ACTION_FOLLOWLINKS_L0 /* grep -r ... SYMLINK follows it */
+                | ACTION_DEPTHFIRST
+                | 0,
                 /* fileAction= */ file_action_grep,
                 /* dirAction= */ NULL,
-                /* userData= */ &matched,
-                /* depth= */ 0);
+                /* userData= */ &matched
+        );
         return matched;
 }
 
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;