Merge branch 'busybox' into merge

1 files changed, 6 insertions, 6 deletions

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index c80cc863f..585a4b58f 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -131,12 +131,13 @@ static int bb_alphasort(const void *p1, const void *p2)
         return (option_mask32 & OPT_r) ? -r : r;
 }
 
-static int FAST_FUNC act(const char *file, struct stat *statbuf, void *args UNUSED_PARAM, int depth)
+static int FAST_FUNC act(struct recursive_state *state,
+                const char *file, struct stat *statbuf)
 {
-        if (depth == 1)
+        if (state->depth == 0)
                 return TRUE;
 
-        if (depth == 2
+        if (state->depth == 1
          && (  !(statbuf->st_mode & (S_IFREG | S_IFLNK))
             || invalid_name(file)
             || (!(option_mask32 & OPT_l) && access(file, X_OK) != 0))
@@ -199,9 +200,8 @@ int run_parts_main(int argc UNUSED_PARAM, char **argv)
                         ACTION_RECURSE|ACTION_FOLLOWLINKS,
                         act,            /* file action */
                         act,            /* dir action */
-                        NULL,           /* user data */
-                        1               /* depth */
-                );
+                        NULL            /* user data */
+        );
 
         if (!names)
                 return 0;