Merge branch 'busybox' into merge

Conflicts:
	include/libbb.h
	shell/ash.c

1 files changed, 30 insertions, 15 deletions

diff --git a/findutils/find.c b/findutils/find.c
index fc0fc5c9f..b521e5b08 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -728,10 +728,27 @@ static int FAST_FUNC fileAction(const char *fileName,
                 int depth IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM))
 {
         int r;
+        int same_fs = 1;
+
+#if ENABLE_FEATURE_FIND_XDEV
+        if (S_ISDIR(statbuf->st_mode) && G.xdev_count) {
+                int i;
+                for (i = 0; i < G.xdev_count; i++) {
+                        if (G.xdev_dev[i] == statbuf->st_dev)
+                                goto found;
+                }
+                //bb_error_msg("'%s': not same fs", fileName);
+                same_fs = 0;
+ found: ;
+        }
+#endif
 
 #if ENABLE_FEATURE_FIND_MAXDEPTH
-        if (depth < G.minmaxdepth[0])
-                return TRUE; /* skip this, continue recursing */
+        if (depth < G.minmaxdepth[0]) {
+                if (same_fs)
+                        return TRUE; /* skip this, continue recursing */
+                return SKIP; /* stop recursing */
+        }
         if (depth > G.minmaxdepth[1])
                 return SKIP; /* stop recursing */
 #endif
@@ -747,21 +764,11 @@ static int FAST_FUNC fileAction(const char *fileName,
                         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;
-                        }
-                        return SKIP;
- found: ;
-                }
+        if (!same_fs) {
+                return SKIP;
         }
-#endif
 
         /* Cannot return 0: our caller, recursive_action(),
          * will perror() and skip dirs (if called on dir) */
@@ -831,6 +838,11 @@ static action*** parse_params(char **argv)
                                 PARM_name      ,
                                 PARM_iname     ,
         IF_FEATURE_FIND_PATH(   PARM_path      ,)
+#if ENABLE_DESKTOP
+        /* -wholename is a synonym for -path */
+        /* We support it because Linux kernel's "make tags" uses it */
+        IF_FEATURE_FIND_PATH(   PARM_wholename ,)
+#endif
         IF_FEATURE_FIND_PATH(   PARM_ipath     ,)
         IF_FEATURE_FIND_REGEX(  PARM_regex     ,)
         IF_FEATURE_FIND_TYPE(   PARM_type      ,)
@@ -869,6 +881,9 @@ static action*** parse_params(char **argv)
                                  "-name\0"
                                  "-iname\0"
         IF_FEATURE_FIND_PATH(   "-path\0"   )
+#if ENABLE_DESKTOP
+        IF_FEATURE_FIND_PATH(   "-wholename\0")
+#endif
         IF_FEATURE_FIND_PATH(   "-ipath\0"  )
         IF_FEATURE_FIND_REGEX(  "-regex\0"  )
         IF_FEATURE_FIND_TYPE(   "-type\0"   )
@@ -1076,7 +1091,7 @@ static action*** parse_params(char **argv)
                         ap->iname = (parm == PARM_iname);
                 }
 #if ENABLE_FEATURE_FIND_PATH
-                else if (parm == PARM_path || parm == PARM_ipath) {
+                else if (parm == PARM_path IF_DESKTOP(|| parm == PARM_wholename) || parm == PARM_ipath) {
                         action_path *ap;
                         dbg("%d", __LINE__);
                         ap = ALLOC_ACTION(path);