libbb: shrink recursive_action() by reducing memory pressure

function                                             old     new   delta
recursive_action1                                      -     316    +316
file_action_grep                                     161     164      +3
add_to_prg_cache_if_socket                           202     205      +3
depmod_main                                          509     511      +2
writeFileToTarball                                   488     489      +1
parse_module                                         281     282      +1
fileAction                                           207     208      +1
act                                                  189     190      +1
add_to_dirlist                                        65      64      -1
writeTarFile                                         196     194      -2
uuidcache_init                                        47      45      -2
uuidcache_check_device                               109     107      -2
true_action                                            8       6      -2
run_parts_main                                       310     308      -2
netstat_main                                         534     532      -2
lsusb_main                                            29      27      -2
lspci_main                                            45      43      -2
initial_scan                                         138     136      -2
grep_main                                            845     843      -2
find_main                                            482     480      -2
config_file_action                                   437     435      -2
chmod_main                                           142     140      -2
dirAction                                             14      10      -4
diff_main                                           1544    1540      -4
chown_main                                           154     148      -6
skip_dir                                             136     129      -7
dir_act                                              191     184      -7
recursive_action                                     453      69    -384
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 7/20 up/down: 328/-439)        Total: -111 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 27e9b6b86..d2988c490 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -65,12 +65,14 @@
  * symbolic links encountered during recursive directory traversals.
  */
 
-static int FAST_FUNC fileAction(const char *fileName, struct stat *statbuf, void* param, int depth)
+static int FAST_FUNC fileAction(struct recursive_state *state,
+                const char *fileName,
+                struct stat *statbuf)
 {
         mode_t newmode;
 
         /* match coreutils behavior */
-        if (depth == 0) {
+        if (state->depth == 0) {
                 /* statbuf holds lstat result, but we need stat (follow link) */
                 if (stat(fileName, statbuf))
                         goto err;
@@ -79,9 +81,9 @@ static int FAST_FUNC fileAction(const char *fileName, struct stat *statbuf, void
                         return TRUE;
         }
 
-        newmode = bb_parse_mode((char *)param, statbuf->st_mode);
+        newmode = bb_parse_mode((char *)state->userData, statbuf->st_mode);
         if (newmode == (mode_t)-1)
-                bb_error_msg_and_die("invalid mode '%s'", (char *)param);
+                bb_error_msg_and_die("invalid mode '%s'", (char *)state->userData);
 
         if (chmod(fileName, newmode) == 0) {
                 if (OPT_VERBOSE
@@ -136,8 +138,7 @@ int chmod_main(int argc UNUSED_PARAM, char **argv)
                         OPT_RECURSE,    // recurse
                         fileAction,     // file action
                         fileAction,     // dir action
-                        smode,          // user data
-                        0)              // depth
+                        smode)          // user data
                 ) {
                         retval = EXIT_FAILURE;
                 }