aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-27 01:51:47 +0200
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2009-09-27 01:51:47 +0200
commit6c750f15180ba51ef37c6cfa381b52e6b05d55aa (patch)
tree8ac8783178491ebd1a57b53ac03829ab717687bd /findutils
parent48f116198d53697d59d03f4e0ff6cd8c04e79660 (diff)
downloadbusybox-6c750f15180ba51ef37c6cfa381b52e6b05d55aa.tar.gz
busybox-6c750f15180ba51ef37c6cfa381b52e6b05d55aa.tar.bz2
find: do not recurse into directories with depth == --maxdepth
This may avoid many, many unnecessary stat() calls function old new delta fileAction 718 758 +40 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'findutils')
-rw-r--r--findutils/find.c28
1 files changed, 18 insertions, 10 deletions
diff --git a/findutils/find.c b/findutils/find.c
index 47c86be15..bd92e2281 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -65,7 +65,7 @@
IF_FEATURE_FIND_XDEV(static dev_t *xdev_dev;)
IF_FEATURE_FIND_XDEV(static int xdev_count;)
-typedef int (*action_fp)(const char *fileName, struct stat *statbuf, void *) FAST_FUNC;
+typedef int (*action_fp)(const char *fileName, const struct stat *statbuf, void *) FAST_FUNC;
typedef struct {
action_fp f;
@@ -77,7 +77,7 @@ typedef struct {
#define ACTS(name, ...) typedef struct { action a; __VA_ARGS__ } action_##name;
#define ACTF(name) \
static int FAST_FUNC func_##name(const char *fileName UNUSED_PARAM, \
- struct stat *statbuf UNUSED_PARAM, \
+ const struct stat *statbuf UNUSED_PARAM, \
action_##name* ap UNUSED_PARAM)
ACTS(print)
@@ -139,7 +139,7 @@ static char* subst(const char *src, unsigned count, const char* filename)
* bit 0=1: matched successfully (TRUE)
*/
-static int exec_actions(action ***appp, const char *fileName, struct stat *statbuf)
+static int exec_actions(action ***appp, const char *fileName, const struct stat *statbuf)
{
int cur_group;
int cur_action;
@@ -392,26 +392,34 @@ static int FAST_FUNC fileAction(const char *fileName,
if (depth < minmaxdepth[0]) return TRUE;
if (depth > minmaxdepth[1]) return SKIP;
-#undef minmaxdepth
#endif
#if ENABLE_FEATURE_FIND_XDEV
- if (S_ISDIR(statbuf->st_mode) && xdev_count) {
- for (i = 0; i < xdev_count; i++) {
- if (xdev_dev[i] == statbuf->st_dev)
- break;
- }
- if (i == xdev_count)
+ if (S_ISDIR(statbuf->st_mode)) {
+ if (xdev_count) {
+ for (i = 0; i < xdev_count; i++) {
+ if (xdev_dev[i] == statbuf->st_dev)
+ goto found;
+ }
return SKIP;
+ found: ;
+ }
}
#endif
i = exec_actions(actions, fileName, statbuf);
/* Had no explicit -print[0] or -exec? then print */
if ((i & TRUE) && need_print)
puts(fileName);
+
+#if ENABLE_FEATURE_FIND_MAXDEPTH
+ if (S_ISDIR(statbuf->st_mode))
+ if (depth == minmaxdepth[1])
+ return SKIP;
+#endif
/* Cannot return 0: our caller, recursive_action(),
* will perror() and skip dirs (if called on dir) */
return (i & SKIP) ? SKIP : TRUE;
+#undef minmaxdepth
}