summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-10 01:33:02 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-01-10 01:33:02 (GMT)
commitce9b97f18bfdd594013dec330e05310125d2ef8d (patch)
treeb0f13e14d7e2db0a3e8b354337cab17b155881b9
parent8ced1e5dc55b972addafb91e4c4f527d41b8ee8e (diff)
downloadbusybox-ce9b97f18bfdd594013dec330e05310125d2ef8d.tar.gz
busybox-ce9b97f18bfdd594013dec330e05310125d2ef8d.tar.bz2
find: correct handling of -xdev
function old new delta find_main 467 448 -19 fileAction 1336 1311 -25 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--findutils/find.c42
1 files changed, 25 insertions, 17 deletions
diff --git a/findutils/find.c b/findutils/find.c
index f0c2598..b417123 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -407,17 +407,33 @@ static int FAST_FUNC fileAction(const char *fileName,
void *userData IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM),
int depth IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM))
{
- int i;
+ int r;
#if ENABLE_FEATURE_FIND_MAXDEPTH
#define minmaxdepth ((int*)userData)
- if (depth < minmaxdepth[0]) return TRUE;
- if (depth > minmaxdepth[1]) return SKIP;
+ if (depth < minmaxdepth[0])
+ return TRUE; /* skip this, continue recursing */
+ if (depth > minmaxdepth[1])
+ return SKIP; /* stop recursing */
#endif
+ r = exec_actions(G.actions, fileName, statbuf);
+ /* Had no explicit -print[0] or -exec? then print */
+ if ((r & TRUE) && G.need_print)
+ puts(fileName);
+
+#if ENABLE_FEATURE_FIND_MAXDEPTH
+ if (S_ISDIR(statbuf->st_mode)) {
+ if (depth == minmaxdepth[1])
+ return SKIP;
+ }
+#endif
#if ENABLE_FEATURE_FIND_XDEV
+ /* -xdev stops on mountpoints, but AFTER mountpoit itself
+ * is processed as usual */
if (S_ISDIR(statbuf->st_mode)) {
if (G.xdev_count) {
+ int i;
for (i = 0; i < G.xdev_count; i++) {
if (G.xdev_dev[i] == statbuf->st_dev)
goto found;
@@ -427,19 +443,10 @@ static int FAST_FUNC fileAction(const char *fileName,
}
}
#endif
- i = exec_actions(G.actions, fileName, statbuf);
- /* Had no explicit -print[0] or -exec? then print */
- if ((i & TRUE) && G.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;
+ return (r & SKIP) ? SKIP : TRUE;
#undef minmaxdepth
}
@@ -914,13 +921,14 @@ IF_FEATURE_FIND_MAXDEPTH(OPT_MINDEPTH,)
struct stat stbuf;
if (!G.xdev_count) {
G.xdev_count = firstopt - 1;
- G.xdev_dev = xmalloc(G.xdev_count * sizeof(dev_t));
+ G.xdev_dev = xzalloc(G.xdev_count * sizeof(G.xdev_dev[0]));
for (i = 1; i < firstopt; i++) {
/* not xstat(): shouldn't bomb out on
* "find not_exist exist -xdev" */
- if (stat(argv[i], &stbuf))
- stbuf.st_dev = -1L;
- G.xdev_dev[i-1] = stbuf.st_dev;
+ if (stat(argv[i], &stbuf) == 0)
+ G.xdev_dev[i-1] = stbuf.st_dev;
+ /* else G.xdev_dev[i-1] stays 0 and
+ * won't match any real device dev_t */
}
}
argp[0] = (char*)"-a";