Apply post-1.20.0 patches, bump version to 1.20.1

[oweals/busybox.git] / findutils / find.c

diff --git a/findutils/find.c b/findutils/find.c
index 05f88d2f0ca3f592c38c4008f39b5b243af42e0b..0ec5bdfeaab175f3a845af44de07008034fd3798 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -831,6 +831,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 +874,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"   )
@@ -932,7 +940,10 @@ static action*** parse_params(char **argv)
  * expression is reached.
  */
                /* Options */
-               if (0) { }
+               if (parm == OPT_FOLLOW) {
+                        dbg("follow enabled: %d", __LINE__);
+                        G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
+               }
 #if ENABLE_FEATURE_FIND_XDEV
                else if (parm == OPT_XDEV) {
                        dbg("%d", __LINE__);
@@ -1073,7 +1084,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);