diff options
Diffstat (limited to 'findutils')
| -rw-r--r-- | findutils/find.c | 17 | ||||
| -rw-r--r-- | findutils/grep.c | 13 |
2 files changed, 14 insertions, 16 deletions
diff --git a/findutils/find.c b/findutils/find.c index 9a2c61b75..e2947afb4 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 @@ -1570,8 +1570,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 0892a713a..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; } @@ -702,8 +701,8 @@ static int grep_dir(const char *dir) | 0, /* fileAction= */ file_action_grep, /* dirAction= */ NULL, - /* userData= */ &matched, - 0); + /* userData= */ &matched + ); return matched; } |