aboutsummaryrefslogtreecommitdiff
path: root/findutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-04-08 11:10:43 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-04-08 11:10:43 +0000
commitb04b4357ff5a5b5194a7ff3c875d8746fac9ff33 (patch)
tree59665356fb143c9b9f3bc089a33641d33beb6a57 /findutils
parentbbd695d8010ab453a5a89ba6d7ebfe1a96b87b7d (diff)
downloadbusybox-b04b4357ff5a5b5194a7ff3c875d8746fac9ff33.tar.gz
busybox-b04b4357ff5a5b5194a7ff3c875d8746fac9ff33.tar.bz2
find: fix -prune more. Add big comment about it.
Diffstat (limited to 'findutils')
-rw-r--r--findutils/find.c28
1 files changed, 21 insertions, 7 deletions
diff --git a/findutils/find.c b/findutils/find.c
index 3eea53db0..594eafca4 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -120,20 +120,34 @@ static int exec_actions(action ***appp, const char *fileName, struct stat *statb
{
int cur_group;
int cur_action;
- int rc = TRUE;
+ int rc = 0;
action **app, *ap;
+ /* "action group" is a set of actions ANDed together.
+ * groups are ORed together.
+ * We simply evaluate each group until we find one in which all actions
+ * succeed. */
+
+ /* -prune is special: if it is encountered, then we won't
+ * descend into current directory. It doesn't matter whether
+ * action group (in which -prune sits) will succeed or not:
+ * find * -prune -name 'f*' -o -name 'm*' -- prunes every dir
+ * find * -name 'f*' -o -prune -name 'm*' -- prunes all dirs
+ * not starting with 'f' */
+
+ /* We invert TRUE bit (bit 0). Now 1 there means 'failure'.
+ * and bitwise OR in "rc |= TRUE ^ ap->f()" will:
+ * (1) make SKIP (-prune) bit stick; and (2) detect 'failure'.
+ * On return, bit is restored. */
+
cur_group = -1;
while ((app = appp[++cur_group])) {
- /* We invert TRUE bit (bit 0). Now 1 there means 'failure'.
- * and bitwise OR in "rc |= TRUE ^ ap->f()" will:
- * (1) make SKIP bit stick; and (2) detect 'failure' */
- rc = 0; /* 'success' so far */
+ rc &= ~TRUE; /* 'success' so far, clear TRUE bit */
cur_action = -1;
while (1) {
ap = app[++cur_action];
if (!ap) /* all actions in group were successful */
- return rc ^ TRUE;
+ return rc ^ TRUE; /* restore TRUE bit */
rc |= TRUE ^ ap->f(fileName, statbuf, ap);
#if ENABLE_FEATURE_FIND_NOT
if (ap->invert) rc ^= TRUE;
@@ -142,7 +156,7 @@ static int exec_actions(action ***appp, const char *fileName, struct stat *statb
break;
}
}
- return rc ^ TRUE; /* straighten things out */
+ return rc ^ TRUE; /* restore TRUE bit */
}