suppress a few "unused function" warnings
[oweals/busybox.git] / findutils / find.c
index 6f7be4fc250563a82fd2f3c321e81693afa075c3..9a2c61b757329187b407fbb932485548e2d940f6 100644 (file)
@@ -7,15 +7,14 @@
  * Reworked by David Douthitt <n9ubh@callsign.net> and
  *  Matt Kraai <kraai@alumni.carnegiemellon.edu>.
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 /* findutils-4.1.20:
  *
  * # find file.txt -exec 'echo {}' '{}  {}' ';'
  * find: echo file.txt: No such file or directory
  * # find file.txt -exec 'echo' '{}  {}' '; '
- * find: missing argument to `-exec'
+ * find: missing argument to '-exec'
  * # find file.txt -exec 'echo {}' '{}  {}' ';' junk
  * find: paths must precede expression
  * # find file.txt -exec 'echo {}' '{}  {}' ';' junk ';'
@@ -44,7 +43,6 @@
  * # find t z t z '(' -name '*t*' -o -name '*z*' ')' -o -print
  * (no output)
  */
-
 /* Testing script
  * ./busybox find "$@" | tee /tmp/bb_find
  * echo ==================
  * echo ==================
  * diff -u /tmp/std_find /tmp/bb_find && echo Identical
  */
+//config:config FIND
+//config:      bool "find (14 kb)"
+//config:      default y
+//config:      help
+//config:      find is used to search your system to find specified files.
+//config:
+//config:config FEATURE_FIND_PRINT0
+//config:      bool "Enable -print0: NUL-terminated output"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Causes output names to be separated by a NUL character
+//config:      rather than a newline. This allows names that contain
+//config:      newlines and other whitespace to be more easily
+//config:      interpreted by other programs.
+//config:
+//config:config FEATURE_FIND_MTIME
+//config:      bool "Enable -mtime: modified time matching"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Allow searching based on the modification time of
+//config:      files, in days.
+//config:
+//config:config FEATURE_FIND_MMIN
+//config:      bool "Enable -mmin: modified time matching by minutes"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Allow searching based on the modification time of
+//config:      files, in minutes.
+//config:
+//config:config FEATURE_FIND_PERM
+//config:      bool "Enable -perm: permissions matching"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_TYPE
+//config:      bool "Enable -type: file type matching (file/dir/link/...)"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Enable searching based on file type (file,
+//config:      directory, socket, device, etc.).
+//config:
+//config:config FEATURE_FIND_EXECUTABLE
+//config:      bool "Enable -executable: file is executable"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_XDEV
+//config:      bool "Enable -xdev: 'stay in filesystem'"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_MAXDEPTH
+//config:      bool "Enable -mindepth N and -maxdepth N"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_NEWER
+//config:      bool "Enable -newer: compare file modification times"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Support the 'find -newer' option for finding any files which have
+//config:      modification time that is more recent than the specified FILE.
+//config:
+//config:config FEATURE_FIND_INUM
+//config:      bool "Enable -inum: inode number matching"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_EXEC
+//config:      bool "Enable -exec: execute commands"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Support the 'find -exec' option for executing commands based upon
+//config:      the files matched.
+//config:
+//config:config FEATURE_FIND_EXEC_PLUS
+//config:      bool "Enable -exec ... {} +"
+//config:      default y
+//config:      depends on FEATURE_FIND_EXEC
+//config:      help
+//config:      Support the 'find -exec ... {} +' option for executing commands
+//config:      for all matched files at once.
+//config:      Without this option, -exec + is a synonym for -exec ;
+//config:      (IOW: it works correctly, but without expected speedup)
+//config:
+//config:config FEATURE_FIND_USER
+//config:      bool "Enable -user: username/uid matching"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_GROUP
+//config:      bool "Enable -group: group/gid matching"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_NOT
+//config:      bool "Enable the 'not' (!) operator"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Support the '!' operator to invert the test results.
+//config:      If 'Enable full-blown desktop' is enabled, then will also support
+//config:      the non-POSIX notation '-not'.
+//config:
+//config:config FEATURE_FIND_DEPTH
+//config:      bool "Enable -depth"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Process each directory's contents before the directory itself.
+//config:
+//config:config FEATURE_FIND_PAREN
+//config:      bool "Enable parens in options"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Enable usage of parens '(' to specify logical order of arguments.
+//config:
+//config:config FEATURE_FIND_SIZE
+//config:      bool "Enable -size: file size matching"
+//config:      default y
+//config:      depends on FIND
+//config:
+//config:config FEATURE_FIND_PRUNE
+//config:      bool "Enable -prune: exclude subdirectories"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      If the file is a directory, don't descend into it. Useful for
+//config:      exclusion .svn and CVS directories.
+//config:
+//config:config FEATURE_FIND_QUIT
+//config:      bool "Enable -quit: exit"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      If this action is reached, 'find' exits.
+//config:
+//config:config FEATURE_FIND_DELETE
+//config:      bool "Enable -delete: delete files/dirs"
+//config:      default y
+//config:      depends on FIND && FEATURE_FIND_DEPTH
+//config:      help
+//config:      Support the 'find -delete' option for deleting files and directories.
+//config:      WARNING: This option can do much harm if used wrong. Busybox will not
+//config:      try to protect the user from doing stupid things. Use with care.
+//config:
+//config:config FEATURE_FIND_EMPTY
+//config:      bool "Enable -empty: match empty files or directories"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Support the 'find -empty' option to find empty regular files
+//config:      or directories.
+//config:
+//config:config FEATURE_FIND_PATH
+//config:      bool "Enable -path: match pathname with shell pattern"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      The -path option matches whole pathname instead of just filename.
+//config:
+//config:config FEATURE_FIND_REGEX
+//config:      bool "Enable -regex: match pathname with regex"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      The -regex option matches whole pathname against regular expression.
+//config:
+//config:config FEATURE_FIND_CONTEXT
+//config:      bool "Enable -context: security context matching"
+//config:      default n
+//config:      depends on FIND && SELINUX
+//config:      help
+//config:      Support the 'find -context' option for matching security context.
+//config:
+//config:config FEATURE_FIND_LINKS
+//config:      bool "Enable -links: link count matching"
+//config:      default y
+//config:      depends on FIND
+//config:      help
+//config:      Support the 'find -links' option for matching number of links.
+
+//applet:IF_FIND(APPLET_NOEXEC(find, find, BB_DIR_USR_BIN, BB_SUID_DROP, find))
+
+//kbuild:lib-$(CONFIG_FIND) += find.o
+
+//usage:#define find_trivial_usage
+//usage:       "[-HL] [PATH]... [OPTIONS] [ACTIONS]"
+//usage:#define find_full_usage "\n\n"
+//usage:       "Search for files and perform actions on them.\n"
+//usage:       "First failed action stops processing of current file.\n"
+//usage:       "Defaults: PATH is current directory, action is '-print'\n"
+//usage:     "\n       -L,-follow      Follow symlinks"
+//usage:     "\n       -H              ...on command line only"
+//usage:       IF_FEATURE_FIND_XDEV(
+//usage:     "\n       -xdev           Don't descend directories on other filesystems"
+//usage:       )
+//usage:       IF_FEATURE_FIND_MAXDEPTH(
+//usage:     "\n       -maxdepth N     Descend at most N levels. -maxdepth 0 applies"
+//usage:     "\n                       actions to command line arguments only"
+//usage:     "\n       -mindepth N     Don't act on first N levels"
+//usage:       )
+//usage:       IF_FEATURE_FIND_DEPTH(
+//usage:     "\n       -depth          Act on directory *after* traversing it"
+//usage:       )
+//usage:     "\n"
+//usage:     "\nActions:"
+//usage:       IF_FEATURE_FIND_PAREN(
+//usage:     "\n       ( ACTIONS )     Group actions for -o / -a"
+//usage:       )
+//usage:       IF_FEATURE_FIND_NOT(
+//usage:     "\n       ! ACT           Invert ACT's success/failure"
+//usage:       )
+//usage:     "\n       ACT1 [-a] ACT2  If ACT1 fails, stop, else do ACT2"
+//usage:     "\n       ACT1 -o ACT2    If ACT1 succeeds, stop, else do ACT2"
+//usage:     "\n                       Note: -a has higher priority than -o"
+//usage:     "\n       -name PATTERN   Match file name (w/o directory name) to PATTERN"
+//usage:     "\n       -iname PATTERN  Case insensitive -name"
+//usage:       IF_FEATURE_FIND_PATH(
+//usage:     "\n       -path PATTERN   Match path to PATTERN"
+//usage:     "\n       -ipath PATTERN  Case insensitive -path"
+//usage:       )
+//usage:       IF_FEATURE_FIND_REGEX(
+//usage:     "\n       -regex PATTERN  Match path to regex PATTERN"
+//usage:       )
+//usage:       IF_FEATURE_FIND_TYPE(
+//usage:     "\n       -type X         File type is X (one of: f,d,l,b,c,s,p)"
+//usage:       )
+//usage:       IF_FEATURE_FIND_EXECUTABLE(
+//usage:     "\n       -executable     File is executable"
+//usage:       )
+//usage:       IF_FEATURE_FIND_PERM(
+//usage:     "\n       -perm MASK      At least one mask bit (+MASK), all bits (-MASK),"
+//usage:     "\n                       or exactly MASK bits are set in file's mode"
+//usage:       )
+//usage:       IF_FEATURE_FIND_MTIME(
+//usage:     "\n       -mtime DAYS     mtime is greater than (+N), less than (-N),"
+//usage:     "\n                       or exactly N days in the past"
+//usage:       )
+//usage:       IF_FEATURE_FIND_MMIN(
+//usage:     "\n       -mmin MINS      mtime is greater than (+N), less than (-N),"
+//usage:     "\n                       or exactly N minutes in the past"
+//usage:       )
+//usage:       IF_FEATURE_FIND_NEWER(
+//usage:     "\n       -newer FILE     mtime is more recent than FILE's"
+//usage:       )
+//usage:       IF_FEATURE_FIND_INUM(
+//usage:     "\n       -inum N         File has inode number N"
+//usage:       )
+//usage:       IF_FEATURE_FIND_USER(
+//usage:     "\n       -user NAME/ID   File is owned by given user"
+//usage:       )
+//usage:       IF_FEATURE_FIND_GROUP(
+//usage:     "\n       -group NAME/ID  File is owned by given group"
+//usage:       )
+//usage:       IF_FEATURE_FIND_SIZE(
+//usage:     "\n       -size N[bck]    File size is N (c:bytes,k:kbytes,b:512 bytes(def.))"
+//usage:     "\n                       +/-N: file size is bigger/smaller than N"
+//usage:       )
+//usage:       IF_FEATURE_FIND_LINKS(
+//usage:     "\n       -links N        Number of links is greater than (+N), less than (-N),"
+//usage:     "\n                       or exactly N"
+//usage:       )
+//usage:       IF_FEATURE_FIND_CONTEXT(
+//usage:     "\n       -context CTX    File has specified security context"
+//usage:       )
+//usage:       IF_FEATURE_FIND_EMPTY(
+//usage:     "\n       -empty          Match empty file/directory"
+//usage:       )
+//usage:       IF_FEATURE_FIND_PRUNE(
+//usage:     "\n       -prune          If current file is directory, don't descend into it"
+//usage:       )
+//usage:     "\nIf none of the following actions is specified, -print is assumed"
+//usage:     "\n       -print          Print file name"
+//usage:       IF_FEATURE_FIND_PRINT0(
+//usage:     "\n       -print0         Print file name, NUL terminated"
+//usage:       )
+//usage:       IF_FEATURE_FIND_EXEC(
+//usage:     "\n       -exec CMD ARG ; Run CMD with all instances of {} replaced by"
+//usage:     "\n                       file name. Fails if CMD exits with nonzero"
+//usage:       )
+//usage:       IF_FEATURE_FIND_EXEC_PLUS(
+//usage:     "\n       -exec CMD ARG + Run CMD with {} replaced by list of file names"
+//usage:       )
+//usage:       IF_FEATURE_FIND_DELETE(
+//usage:     "\n       -delete         Delete current file/directory. Turns on -depth option"
+//usage:       )
+//usage:       IF_FEATURE_FIND_QUIT(
+//usage:     "\n       -quit           Exit"
+//usage:       )
+//usage:
+//usage:#define find_example_usage
+//usage:       "$ find / -name passwd\n"
+//usage:       "/etc/passwd\n"
 
 #include <fnmatch.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 #if ENABLE_FEATURE_FIND_REGEX
-#include "xregex.h"
+# include "xregex.h"
+#endif
+/* GNUism: */
+#ifndef FNM_CASEFOLD
+# define FNM_CASEFOLD 0
 #endif
 
+#if 1
+# define dbg(...) ((void)0)
+#else
+# define dbg(...) bb_error_msg(__VA_ARGS__)
+#endif
+
+
 /* This is a NOEXEC applet. Be very careful! */
 
 
@@ -79,10 +390,11 @@ typedef struct {
 
                         ACTS(print)
                         ACTS(name,  const char *pattern; bool iname;)
-IF_FEATURE_FIND_PATH(   ACTS(path,  const char *pattern;))
+IF_FEATURE_FIND_PATH(   ACTS(path,  const char *pattern; bool ipath;))
 IF_FEATURE_FIND_REGEX(  ACTS(regex, regex_t compiled_pattern;))
 IF_FEATURE_FIND_PRINT0( ACTS(print0))
 IF_FEATURE_FIND_TYPE(   ACTS(type,  int type_mask;))
+IF_FEATURE_FIND_EXECUTABLE(ACTS(executable))
 IF_FEATURE_FIND_PERM(   ACTS(perm,  char perm_char; mode_t perm_mask;))
 IF_FEATURE_FIND_MTIME(  ACTS(mtime, char mtime_char; unsigned mtime_days;))
 IF_FEATURE_FIND_MMIN(   ACTS(mmin,  char mmin_char; unsigned mmin_mins;))
@@ -93,56 +405,51 @@ IF_FEATURE_FIND_SIZE(   ACTS(size,  char size_char; off_t size;))
 IF_FEATURE_FIND_CONTEXT(ACTS(context, security_context_t context;))
 IF_FEATURE_FIND_PAREN(  ACTS(paren, action ***subexpr;))
 IF_FEATURE_FIND_PRUNE(  ACTS(prune))
+IF_FEATURE_FIND_QUIT(   ACTS(quit))
 IF_FEATURE_FIND_DELETE( ACTS(delete))
-IF_FEATURE_FIND_EXEC(   ACTS(exec,  char **exec_argv; unsigned *subst_count; int exec_argc;))
+IF_FEATURE_FIND_EMPTY(  ACTS(empty))
+IF_FEATURE_FIND_EXEC(   ACTS(exec,
+                               char **exec_argv; /* -exec ARGS */
+                               unsigned *subst_count;
+                               int exec_argc; /* count of ARGS */
+                               IF_FEATURE_FIND_EXEC_PLUS(
+                                       /*
+                                        * filelist is NULL if "exec ;"
+                                        * non-NULL if "exec +"
+                                        */
+                                       char **filelist;
+                                       int filelist_idx;
+                                       int file_len;
+                               )
+                               ))
 IF_FEATURE_FIND_GROUP(  ACTS(group, gid_t gid;))
+IF_FEATURE_FIND_LINKS(  ACTS(links, char links_char; int links_count;))
 
 struct globals {
        IF_FEATURE_FIND_XDEV(dev_t *xdev_dev;)
        IF_FEATURE_FIND_XDEV(int xdev_count;)
+#if ENABLE_FEATURE_FIND_MAXDEPTH
+       int minmaxdepth[2];
+#endif
        action ***actions;
-       bool need_print;
+       smallint need_print;
+       smallint xdev_on;
+       smalluint exitstatus;
        recurse_flags_t recurse_flags;
-};
-#define G (*(struct globals*)&bb_common_bufsiz1)
+       IF_FEATURE_FIND_EXEC_PLUS(unsigned max_argv_len;)
+} FIX_ALIASING;
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { \
-       struct G_sizecheck { \
-               char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-       }; \
+       setup_common_bufsiz(); \
+       BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \
+       /* we have to zero it out because of NOEXEC */ \
+       memset(&G, 0, sizeof(G)); \
+       IF_FEATURE_FIND_MAXDEPTH(G.minmaxdepth[1] = INT_MAX;) \
+       IF_FEATURE_FIND_EXEC_PLUS(G.max_argv_len = bb_arg_max() - 2048;) \
        G.need_print = 1; \
        G.recurse_flags = ACTION_RECURSE; \
 } while (0)
 
-#if ENABLE_FEATURE_FIND_EXEC
-static unsigned count_subst(const char *str)
-{
-       unsigned count = 0;
-       while ((str = strstr(str, "{}")) != NULL) {
-               count++;
-               str++;
-       }
-       return count;
-}
-
-
-static char* subst(const char *src, unsigned count, const char* filename)
-{
-       char *buf, *dst, *end;
-       size_t flen = strlen(filename);
-       /* we replace each '{}' with filename: growth by strlen-2 */
-       buf = dst = xmalloc(strlen(src) + count*(flen-2) + 1);
-       while ((end = strstr(src, "{}"))) {
-               memcpy(dst, src, end - src);
-               dst += end - src;
-               src = end + 2;
-               memcpy(dst, filename, flen);
-               dst += flen;
-       }
-       strcpy(dst, src);
-       return buf;
-}
-#endif
-
 /* Return values of ACTFs ('action functions') are a bit mask:
  * bit 1=1: prune (use SKIP constant for setting it)
  * bit 0=1: matched successfully (TRUE)
@@ -173,7 +480,7 @@ static int exec_actions(action ***appp, const char *fileName, const struct stat
         * On return, bit is restored.  */
 
        cur_group = -1;
-       while ((app = appp[++cur_group])) {
+       while ((app = appp[++cur_group]) != NULL) {
                rc &= ~TRUE; /* 'success' so far, clear TRUE bit */
                cur_action = -1;
                while (1) {
@@ -184,31 +491,93 @@ static int exec_actions(action ***appp, const char *fileName, const struct stat
 #if ENABLE_FEATURE_FIND_NOT
                        if (ap->invert) rc ^= TRUE;
 #endif
+                       dbg("grp %d action %d rc:0x%x", cur_group, cur_action, rc);
                        if (rc & TRUE) /* current group failed, try next */
                                break;
                }
        }
+       dbg("returning:0x%x", rc ^ TRUE);
        return rc ^ TRUE; /* restore TRUE bit */
 }
 
+#if !FNM_CASEFOLD
+static char *strcpy_upcase(char *dst, const char *src)
+{
+       char *d = dst;
+       while (1) {
+               unsigned char ch = *src++;
+               if (ch >= 'a' && ch <= 'z')
+                       ch -= ('a' - 'A');
+               *d++ = ch;
+               if (ch == '\0')
+                       break;
+       }
+       return dst;
+}
+#endif
 
 ACTF(name)
 {
+       int r;
        const char *tmp = bb_basename(fileName);
-       if (tmp != fileName && !*tmp) { /* "foo/bar/". Oh no... go back to 'b' */
-               tmp--;
-               while (tmp != fileName && *--tmp != '/')
-                       continue;
-               if (*tmp == '/')
-                       tmp++;
+       /* GNU findutils: find DIR/ -name DIR
+        * prints "DIR/" (DIR// prints "DIR//" etc).
+        * Need to strip trailing "/".
+        * Such names can come only from top-level names, but
+        * we can't do this before recursive_action() call,
+        * since then "find FILE/ -name FILE"
+        * would also work (on non-directories), which is wrong.
+        */
+       char *trunc_slash = NULL;
+
+       if (*tmp == '\0') {
+               /* "foo/bar/[//...]" */
+               while (tmp != fileName && tmp[-1] == '/')
+                       tmp--;
+               if (tmp == fileName) { /* entire fileName is "//.."? */
+                       /* yes, convert "//..." to "/"
+                        * Testcases:
+                        * find / -maxdepth 1 -name /: prints /
+                        * find // -maxdepth 1 -name /: prints //
+                        * find / -maxdepth 1 -name //: prints nothing
+                        * find // -maxdepth 1 -name //: prints nothing
+                        */
+                       if (tmp[1])
+                               trunc_slash = (char*)tmp + 1;
+               } else {
+                       /* no, it's "foo/bar/[//...]", go back to 'b' */
+                       trunc_slash = (char*)tmp;
+                       while (tmp != fileName && tmp[-1] != '/')
+                               tmp--;
+               }
        }
-       return fnmatch(ap->pattern, tmp, FNM_PERIOD | (ap->iname ? FNM_CASEFOLD : 0)) == 0;
+
+       /* Was using FNM_PERIOD flag too,
+        * but somewhere between 4.1.20 and 4.4.0 GNU find stopped using it.
+        * find -name '*foo' should match .foo too:
+        */
+       if (trunc_slash) *trunc_slash = '\0';
+#if FNM_CASEFOLD
+       r = fnmatch(ap->pattern, tmp, (ap->iname ? FNM_CASEFOLD : 0));
+#else
+       if (ap->iname)
+               tmp = strcpy_upcase(alloca(strlen(tmp) + 1), tmp);
+       r = fnmatch(ap->pattern, tmp, 0);
+#endif
+       if (trunc_slash) *trunc_slash = '/';
+       return r == 0;
 }
 
 #if ENABLE_FEATURE_FIND_PATH
 ACTF(path)
 {
+# if FNM_CASEFOLD
+       return fnmatch(ap->pattern, fileName, (ap->ipath ? FNM_CASEFOLD : 0)) == 0;
+# else
+       if (ap->ipath)
+               fileName = strcpy_upcase(alloca(strlen(fileName) + 1), fileName);
        return fnmatch(ap->pattern, fileName, 0) == 0;
+# endif
 }
 #endif
 #if ENABLE_FEATURE_FIND_REGEX
@@ -230,11 +599,17 @@ ACTF(type)
        return ((statbuf->st_mode & S_IFMT) == ap->type_mask);
 }
 #endif
+#if ENABLE_FEATURE_FIND_EXECUTABLE
+ACTF(executable)
+{
+       return access(fileName, X_OK) == 0;
+}
+#endif
 #if ENABLE_FEATURE_FIND_PERM
 ACTF(perm)
 {
-       /* -perm +mode: at least one of perm_mask bits are set */
-       if (ap->perm_char == '+')
+       /* -perm [+/]mode: at least one of perm_mask bits are set */
+       if (ap->perm_char == '+' || ap->perm_char == '/')
                return (statbuf->st_mode & ap->perm_mask) != 0;
        /* -perm -mode: all of perm_mask are set */
        if (ap->perm_char == '-')
@@ -282,17 +657,57 @@ ACTF(inum)
 }
 #endif
 #if ENABLE_FEATURE_FIND_EXEC
-ACTF(exec)
+static int do_exec(action_exec *ap, const char *fileName)
 {
        int i, rc;
-#if ENABLE_USE_PORTABLE_CODE
-       char **argv = alloca(sizeof(char*) * (ap->exec_argc + 1));
-#else /* gcc 4.3.1 generates smaller code: */
-       char *argv[ap->exec_argc + 1];
-#endif
-       for (i = 0; i < ap->exec_argc; i++)
-               argv[i] = subst(ap->exec_argv[i], ap->subst_count[i], fileName);
-       argv[i] = NULL; /* terminate the list */
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+       int size = ap->exec_argc + ap->filelist_idx + 1;
+# else
+       int size = ap->exec_argc + 1;
+# endif
+# if ENABLE_USE_PORTABLE_CODE
+       char **argv = alloca(sizeof(char*) * size);
+# else /* gcc 4.3.1 generates smaller code: */
+       char *argv[size];
+# endif
+       char **pp = argv;
+
+       for (i = 0; i < ap->exec_argc; i++) {
+               const char *arg = ap->exec_argv[i];
+
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+               if (ap->filelist) {
+                       /* Handling "-exec +"
+                        * Only one exec_argv[i] has substitution in it.
+                        * Expand that one exec_argv[i] into file list.
+                        */
+                       if (ap->subst_count[i] == 0) {
+                               *pp++ = xstrdup(arg);
+                       } else {
+                               int j = 0;
+                               while (ap->filelist[j]) {
+                                       /* 2nd arg here should be ap->subst_count[i], but it is always 1: */
+                                       *pp++ = xmalloc_substitute_string(arg, 1, "{}", ap->filelist[j]);
+                                       free(ap->filelist[j]);
+                                       j++;
+                               }
+                       }
+               } else
+# endif
+               {
+                       /* Handling "-exec ;" */
+                       *pp++ = xmalloc_substitute_string(arg, ap->subst_count[i], "{}", fileName);
+               }
+       }
+       *pp = NULL; /* terminate the list */
+
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+       if (ap->filelist) {
+               ap->filelist[0] = NULL;
+               ap->filelist_idx = 0;
+               ap->file_len = 0;
+       }
+# endif
 
        rc = spawn_and_wait(argv);
        if (rc < 0)
@@ -303,6 +718,48 @@ ACTF(exec)
                free(argv[i++]);
        return rc == 0; /* return 1 if exitcode 0 */
 }
+ACTF(exec)
+{
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+       if (ap->filelist) {
+               int rc;
+
+               ap->filelist = xrealloc_vector(ap->filelist, 8, ap->filelist_idx);
+               ap->filelist[ap->filelist_idx++] = xstrdup(fileName);
+               ap->file_len += strlen(fileName) + sizeof(char*) + 1;
+               /* If we have lots of files already, exec the command */
+               rc = 1;
+               if (ap->file_len >= G.max_argv_len)
+                       rc = do_exec(ap, NULL);
+               return rc;
+       }
+# endif
+       return do_exec(ap, fileName);
+}
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+static int flush_exec_plus(void)
+{
+       action *ap;
+       action **app;
+       action ***appp = G.actions;
+       while ((app = *appp++) != NULL) {
+               while ((ap = *app++) != NULL) {
+                       if (ap->f == (action_fp)func_exec) {
+                               action_exec *ae = (void*)ap;
+                               if (ae->filelist_idx != 0) {
+                                       int rc = do_exec(ae, NULL);
+#  if ENABLE_FEATURE_FIND_NOT
+                                       if (ap->invert) rc = !rc;
+#  endif
+                                       if (rc == 0)
+                                               return 1;
+                               }
+                       }
+               }
+       }
+       return 0;
+}
+# endif
 #endif
 #if ENABLE_FEATURE_FIND_USER
 ACTF(user)
@@ -356,12 +813,21 @@ ACTF(prune)
        return SKIP + TRUE;
 }
 #endif
+#if ENABLE_FEATURE_FIND_QUIT
+ACTF(quit)
+{
+       exit(G.exitstatus);
+}
+#endif
 #if ENABLE_FEATURE_FIND_DELETE
 ACTF(delete)
 {
        int rc;
        if (S_ISDIR(statbuf->st_mode)) {
-               rc = rmdir(fileName);
+               /* "find . -delete" skips rmdir(".") */
+               rc = 0;
+               if (NOT_LONE_CHAR(fileName, '.'))
+                       rc = rmdir(fileName);
        } else {
                rc = unlink(fileName);
        }
@@ -370,6 +836,30 @@ ACTF(delete)
        return TRUE;
 }
 #endif
+#if ENABLE_FEATURE_FIND_EMPTY
+ACTF(empty)
+{
+       if (S_ISDIR(statbuf->st_mode)) {
+               DIR *dir;
+               struct dirent *dent;
+
+               dir = opendir(fileName);
+               if (!dir) {
+                       bb_simple_perror_msg(fileName);
+                       return FALSE;
+               }
+
+               while ((dent = readdir(dir)) != NULL
+                && DOT_OR_DOTDOT(dent->d_name)
+               ) {
+                       continue;
+               }
+               closedir(dir);
+               return dent == NULL;
+       }
+       return S_ISREG(statbuf->st_mode) && statbuf->st_size == 0;
+}
+#endif
 #if ENABLE_FEATURE_FIND_CONTEXT
 ACTF(context)
 {
@@ -388,47 +878,68 @@ ACTF(context)
        return rc == 0;
 }
 #endif
-
+#if ENABLE_FEATURE_FIND_LINKS
+ACTF(links)
+{
+       switch(ap->links_char) {
+       case '-' : return (statbuf->st_nlink <  ap->links_count);
+       case '+' : return (statbuf->st_nlink >  ap->links_count);
+       default:   return (statbuf->st_nlink == ap->links_count);
+       }
+}
+#endif
 
 static int FAST_FUNC fileAction(const char *fileName,
                struct stat *statbuf,
-               void *userData IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM),
+               void *userData UNUSED_PARAM,
                int depth IF_NOT_FEATURE_FIND_MAXDEPTH(UNUSED_PARAM))
 {
-       int i;
-#if ENABLE_FEATURE_FIND_MAXDEPTH
-#define minmaxdepth ((int*)userData)
-
-       if (depth < minmaxdepth[0]) return TRUE;
-       if (depth > minmaxdepth[1]) return SKIP;
-#endif
+       int r;
+       int same_fs = 1;
 
 #if ENABLE_FEATURE_FIND_XDEV
-       if (S_ISDIR(statbuf->st_mode)) {
-               if (G.xdev_count) {
-                       for (i = 0; i < G.xdev_count; i++) {
-                               if (G.xdev_dev[i] == statbuf->st_dev)
-                                       goto found;
-                       }
-                       return SKIP;
- found: ;
+       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
-       i = exec_actions(G.actions, fileName, statbuf);
+
+#if ENABLE_FEATURE_FIND_MAXDEPTH
+       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
+
+       r = exec_actions(G.actions, fileName, statbuf);
        /* Had no explicit -print[0] or -exec? then print */
-       if ((i & TRUE) && G.need_print)
+       if ((r & TRUE) && G.need_print)
                puts(fileName);
 
 #if ENABLE_FEATURE_FIND_MAXDEPTH
-       if (S_ISDIR(statbuf->st_mode))
-               if (depth == minmaxdepth[1])
+       if (S_ISDIR(statbuf->st_mode)) {
+               if (depth == G.minmaxdepth[1])
                        return SKIP;
+       }
 #endif
+       /* -xdev stops on mountpoints, but AFTER mountpoit itself
+        * is processed as usual */
+       if (!same_fs) {
+               return SKIP;
+       }
+
        /* Cannot return 0: our caller, recursive_action(),
         * will perror() and skip dirs (if called on dir) */
-       return (i & SKIP) ? SKIP : TRUE;
-#undef minmaxdepth
+       return (r & SKIP) ? SKIP : TRUE;
 }
 
 
@@ -453,7 +964,7 @@ static int find_type(const char *type)
                mask = S_IFSOCK;
 
        if (mask == 0 || type[1] != '\0')
-               bb_error_msg_and_die(bb_msg_invalid_arg, type, "-type");
+               bb_error_msg_and_die(bb_msg_invalid_arg_to, type, "-type");
 
        return mask;
 }
@@ -461,7 +972,7 @@ static int find_type(const char *type)
 
 #if ENABLE_FEATURE_FIND_PERM \
  || ENABLE_FEATURE_FIND_MTIME || ENABLE_FEATURE_FIND_MMIN \
- || ENABLE_FEATURE_FIND_SIZE
+ || ENABLE_FEATURE_FIND_SIZE  || ENABLE_FEATURE_FIND_LINKS
 static const char* plus_minus_num(const char* str)
 {
        if (*str == '-' || *str == '+')
@@ -470,9 +981,37 @@ static const char* plus_minus_num(const char* str)
 }
 #endif
 
+/* Say no to GCCism */
+#define USE_NESTED_FUNCTION 0
+
+#if !USE_NESTED_FUNCTION
+struct pp_locals {
+       action*** appp;
+       unsigned cur_group;
+       unsigned cur_action;
+       IF_FEATURE_FIND_NOT( bool invert_flag; )
+};
+static action* alloc_action(struct pp_locals *ppl, int sizeof_struct, action_fp f)
+{
+       action *ap = xzalloc(sizeof_struct);
+       action **app;
+       action ***group = &ppl->appp[ppl->cur_group];
+       *group = app = xrealloc(*group, (ppl->cur_action+2) * sizeof(ppl->appp[0][0]));
+       app[ppl->cur_action++] = ap;
+       app[ppl->cur_action] = NULL;
+       ap->f = f;
+       IF_FEATURE_FIND_NOT( ap->invert = ppl->invert_flag; )
+       IF_FEATURE_FIND_NOT( ppl->invert_flag = 0; )
+       return ap;
+}
+#endif
+
 static action*** parse_params(char **argv)
 {
        enum {
+                               OPT_FOLLOW     ,
+       IF_FEATURE_FIND_XDEV(   OPT_XDEV       ,)
+       IF_FEATURE_FIND_DEPTH(  OPT_DEPTH      ,)
                                PARM_a         ,
                                PARM_o         ,
        IF_FEATURE_FIND_NOT(    PARM_char_not  ,)
@@ -483,15 +1022,23 @@ static action*** parse_params(char **argv)
 #endif
                                PARM_print     ,
        IF_FEATURE_FIND_PRINT0( PARM_print0    ,)
-       IF_FEATURE_FIND_DEPTH(  PARM_depth     ,)
        IF_FEATURE_FIND_PRUNE(  PARM_prune     ,)
+       IF_FEATURE_FIND_QUIT(   PARM_quit      ,)
        IF_FEATURE_FIND_DELETE( PARM_delete    ,)
+       IF_FEATURE_FIND_EMPTY(  PARM_empty     ,)
        IF_FEATURE_FIND_EXEC(   PARM_exec      ,)
+       IF_FEATURE_FIND_EXECUTABLE(PARM_executable,)
        IF_FEATURE_FIND_PAREN(  PARM_char_brace,)
-       /* All options starting from here require argument */
+       /* All options/actions starting from here require argument */
                                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      ,)
        IF_FEATURE_FIND_PERM(   PARM_perm      ,)
@@ -503,28 +1050,39 @@ static action*** parse_params(char **argv)
        IF_FEATURE_FIND_GROUP(  PARM_group     ,)
        IF_FEATURE_FIND_SIZE(   PARM_size      ,)
        IF_FEATURE_FIND_CONTEXT(PARM_context   ,)
+       IF_FEATURE_FIND_LINKS(  PARM_links     ,)
+       IF_FEATURE_FIND_MAXDEPTH(OPT_MINDEPTH,OPT_MAXDEPTH,)
        };
 
        static const char params[] ALIGN1 =
-                                "-a\0"
-                                "-o\0"
+                               "-follow\0"
+       IF_FEATURE_FIND_XDEV(   "-xdev\0"                 )
+       IF_FEATURE_FIND_DEPTH(  "-depth\0"                )
+                               "-a\0"
+                               "-o\0"
        IF_FEATURE_FIND_NOT(    "!\0"       )
 #if ENABLE_DESKTOP
-                                "-and\0"
-                                "-or\0"
-       IF_FEATURE_FIND_NOT(     "-not\0"    )
+                               "-and\0"
+                               "-or\0"
+       IF_FEATURE_FIND_NOT(    "-not\0"    )
 #endif
-                                "-print\0"
+                               "-print\0"
        IF_FEATURE_FIND_PRINT0( "-print0\0" )
-       IF_FEATURE_FIND_DEPTH(  "-depth\0"  )
        IF_FEATURE_FIND_PRUNE(  "-prune\0"  )
+       IF_FEATURE_FIND_QUIT(   "-quit\0"  )
        IF_FEATURE_FIND_DELETE( "-delete\0" )
+       IF_FEATURE_FIND_EMPTY(  "-empty\0"  )
        IF_FEATURE_FIND_EXEC(   "-exec\0"   )
+       IF_FEATURE_FIND_EXECUTABLE("-executable\0")
        IF_FEATURE_FIND_PAREN(  "(\0"       )
-       /* All options starting from here require argument */
-                                "-name\0"
-                                "-iname\0"
+       /* All options/actions starting from here require argument */
+                               "-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"   )
        IF_FEATURE_FIND_PERM(   "-perm\0"   )
@@ -536,54 +1094,55 @@ static action*** parse_params(char **argv)
        IF_FEATURE_FIND_GROUP(  "-group\0"  )
        IF_FEATURE_FIND_SIZE(   "-size\0"   )
        IF_FEATURE_FIND_CONTEXT("-context\0")
-                                ;
+       IF_FEATURE_FIND_LINKS(  "-links\0"  )
+       IF_FEATURE_FIND_MAXDEPTH("-mindepth\0""-maxdepth\0")
+       ;
 
+#if !USE_NESTED_FUNCTION
+       struct pp_locals ppl;
+#define appp        (ppl.appp       )
+#define cur_group   (ppl.cur_group  )
+#define cur_action  (ppl.cur_action )
+#define invert_flag (ppl.invert_flag)
+#define ALLOC_ACTION(name) (action_##name*)alloc_action(&ppl, sizeof(action_##name), (action_fp) func_##name)
+#else
        action*** appp;
-       unsigned cur_group = 0;
-       unsigned cur_action = 0;
-       IF_FEATURE_FIND_NOT( bool invert_flag = 0; )
+       unsigned cur_group;
+       unsigned cur_action;
+       IF_FEATURE_FIND_NOT( bool invert_flag; )
 
        /* This is the only place in busybox where we use nested function.
         * So far more standard alternatives were bigger. */
-       /* Suppress a warning "func without a prototype" */
+       /* Auto decl suppresses "func without a prototype" warning: */
        auto action* alloc_action(int sizeof_struct, action_fp f);
        action* alloc_action(int sizeof_struct, action_fp f)
        {
                action *ap;
-               appp[cur_group] = xrealloc(appp[cur_group], (cur_action+2) * sizeof(*appp));
-               appp[cur_group][cur_action++] = ap = xmalloc(sizeof_struct);
+               appp[cur_group] = xrealloc(appp[cur_group], (cur_action+2) * sizeof(appp[0][0]));
+               appp[cur_group][cur_action++] = ap = xzalloc(sizeof_struct);
                appp[cur_group][cur_action] = NULL;
                ap->f = f;
                IF_FEATURE_FIND_NOT( ap->invert = invert_flag; )
                IF_FEATURE_FIND_NOT( invert_flag = 0; )
                return ap;
        }
-
 #define ALLOC_ACTION(name) (action_##name*)alloc_action(sizeof(action_##name), (action_fp) func_##name)
+#endif
 
+       cur_group = 0;
+       cur_action = 0;
+       IF_FEATURE_FIND_NOT( invert_flag = 0; )
        appp = xzalloc(2 * sizeof(appp[0])); /* appp[0],[1] == NULL */
 
-/* Actions have side effects and return a true or false value
- * We implement: -print, -print0, -exec
- *
- * The rest are tests.
- *
- * Tests and actions are grouped by operators
- * ( expr )              Force precedence
- * ! expr                True if expr is false
- * -not expr             Same as ! expr
- * expr1 [-a[nd]] expr2  And; expr2 is not evaluated if expr1 is false
- * expr1 -o[r] expr2     Or; expr2 is not evaluated if expr1 is true
- * expr1 , expr2         List; both expr1 and expr2 are always evaluated
- * We implement: (), -a, -o
- */
        while (*argv) {
                const char *arg = argv[0];
                int parm = index_in_strings(params, arg);
                const char *arg1 = argv[1];
 
+               dbg("arg:'%s' arg1:'%s' parm:%d PARM_type:%d", arg, arg1, parm, PARM_type);
+
                if (parm >= PARM_name) {
-                       /* All options starting from -name require argument */
+                       /* All options/actions starting from -name require argument */
                        if (!arg1)
                                bb_error_msg_and_die(bb_msg_requires_arg, arg);
                        argv++;
@@ -592,14 +1151,52 @@ static action*** parse_params(char **argv)
                /* We can use big switch() here, but on i386
                 * it doesn't give smaller code. Other arches? */
 
-       /* --- Operators --- */
-               if (parm == PARM_a IF_DESKTOP(|| parm == PARM_and)) {
+/* Options always return true. They always take effect
+ * rather than being processed only when their place in the
+ * expression is reached.
+ */
+               /* Options */
+               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__);
+                       G.xdev_on = 1;
+               }
+#endif
+#if ENABLE_FEATURE_FIND_MAXDEPTH
+               else if (parm == OPT_MINDEPTH || parm == OPT_MINDEPTH + 1) {
+                       dbg("%d", __LINE__);
+                       G.minmaxdepth[parm - OPT_MINDEPTH] = xatoi_positive(arg1);
+               }
+#endif
+#if ENABLE_FEATURE_FIND_DEPTH
+               else if (parm == OPT_DEPTH) {
+                       dbg("%d", __LINE__);
+                       G.recurse_flags |= ACTION_DEPTHFIRST;
+               }
+#endif
+/* Actions are grouped by operators
+ * ( expr )              Force precedence
+ * ! expr                True if expr is false
+ * -not expr             Same as ! expr
+ * expr1 [-a[nd]] expr2  And; expr2 is not evaluated if expr1 is false
+ * expr1 -o[r] expr2     Or; expr2 is not evaluated if expr1 is true
+ * expr1 , expr2         List; both expr1 and expr2 are always evaluated
+ * We implement: (), -a, -o
+ */
+               /* Operators */
+               else if (parm == PARM_a IF_DESKTOP(|| parm == PARM_and)) {
+                       dbg("%d", __LINE__);
                        /* no further special handling required */
                }
                else if (parm == PARM_o IF_DESKTOP(|| parm == PARM_or)) {
+                       dbg("%d", __LINE__);
                        /* start new OR group */
                        cur_group++;
-                       appp = xrealloc(appp, (cur_group+2) * sizeof(*appp));
+                       appp = xrealloc(appp, (cur_group+2) * sizeof(appp[0]));
                        /*appp[cur_group] = NULL; - already NULL */
                        appp[cur_group+1] = NULL;
                        cur_action = 0;
@@ -608,55 +1205,74 @@ static action*** parse_params(char **argv)
                else if (parm == PARM_char_not IF_DESKTOP(|| parm == PARM_not)) {
                        /* also handles "find ! ! -name 'foo*'" */
                        invert_flag ^= 1;
+                       dbg("invert_flag:%d", invert_flag);
                }
 #endif
-
-       /* --- Tests and actions --- */
+               /* Actions */
                else if (parm == PARM_print) {
+                       dbg("%d", __LINE__);
                        G.need_print = 0;
-                       /* GNU find ignores '!' here: "find ! -print" */
-                       IF_FEATURE_FIND_NOT( invert_flag = 0; )
                        (void) ALLOC_ACTION(print);
                }
 #if ENABLE_FEATURE_FIND_PRINT0
                else if (parm == PARM_print0) {
+                       dbg("%d", __LINE__);
                        G.need_print = 0;
-                       IF_FEATURE_FIND_NOT( invert_flag = 0; )
                        (void) ALLOC_ACTION(print0);
                }
 #endif
-#if ENABLE_FEATURE_FIND_DEPTH
-               else if (parm == PARM_depth) {
-                       G.recurse_flags |= ACTION_DEPTHFIRST;
-               }
-#endif
 #if ENABLE_FEATURE_FIND_PRUNE
                else if (parm == PARM_prune) {
-                       IF_FEATURE_FIND_NOT( invert_flag = 0; )
+                       dbg("%d", __LINE__);
                        (void) ALLOC_ACTION(prune);
                }
 #endif
+#if ENABLE_FEATURE_FIND_QUIT
+               else if (parm == PARM_quit) {
+                       dbg("%d", __LINE__);
+                       (void) ALLOC_ACTION(quit);
+               }
+#endif
 #if ENABLE_FEATURE_FIND_DELETE
                else if (parm == PARM_delete) {
+                       dbg("%d", __LINE__);
                        G.need_print = 0;
                        G.recurse_flags |= ACTION_DEPTHFIRST;
                        (void) ALLOC_ACTION(delete);
                }
 #endif
+#if ENABLE_FEATURE_FIND_EMPTY
+               else if (parm == PARM_empty) {
+                       dbg("%d", __LINE__);
+                       (void) ALLOC_ACTION(empty);
+               }
+#endif
 #if ENABLE_FEATURE_FIND_EXEC
                else if (parm == PARM_exec) {
                        int i;
                        action_exec *ap;
+                       IF_FEATURE_FIND_EXEC_PLUS(int all_subst = 0;)
+                       dbg("%d", __LINE__);
                        G.need_print = 0;
-                       IF_FEATURE_FIND_NOT( invert_flag = 0; )
                        ap = ALLOC_ACTION(exec);
                        ap->exec_argv = ++argv; /* first arg after -exec */
-                       ap->exec_argc = 0;
+                       /*ap->exec_argc = 0; - ALLOC_ACTION did it */
                        while (1) {
-                               if (!*argv) /* did not see ';' until end */
-                                       bb_error_msg_and_die("-exec CMD must end by ';'");
-                               if (LONE_CHAR(argv[0], ';'))
+                               if (!*argv) /* did not see ';' or '+' until end */
+                                       bb_error_msg_and_die(bb_msg_requires_arg, "-exec");
+                               // find -exec echo Foo ">{}<" ";"
+                               // executes "echo Foo >FILENAME<",
+                               // find -exec echo Foo ">{}<" "+"
+                               // executes "echo Foo FILENAME1 FILENAME2 FILENAME3...".
+                               if ((argv[0][0] == ';' || argv[0][0] == '+')
+                                && argv[0][1] == '\0'
+                               ) {
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+                                       if (argv[0][0] == '+')
+                                               ap->filelist = xzalloc(sizeof(ap->filelist[0]));
+# endif
                                        break;
+                               }
                                argv++;
                                ap->exec_argc++;
                        }
@@ -664,8 +1280,17 @@ static action*** parse_params(char **argv)
                                bb_error_msg_and_die(bb_msg_requires_arg, arg);
                        ap->subst_count = xmalloc(ap->exec_argc * sizeof(int));
                        i = ap->exec_argc;
-                       while (i--)
-                               ap->subst_count[i] = count_subst(ap->exec_argv[i]);
+                       while (i--) {
+                               ap->subst_count[i] = count_strstr(ap->exec_argv[i], "{}");
+                               IF_FEATURE_FIND_EXEC_PLUS(all_subst += ap->subst_count[i];)
+                       }
+# if ENABLE_FEATURE_FIND_EXEC_PLUS
+                       /*
+                        * coreutils expects {} to appear only once in "-exec +"
+                        */
+                       if (all_subst != 1 && ap->filelist)
+                               bb_simple_error_msg_and_die("only one '{}' allowed for -exec +");
+# endif
                }
 #endif
 #if ENABLE_FEATURE_FIND_PAREN
@@ -674,10 +1299,11 @@ static action*** parse_params(char **argv)
                        char **endarg;
                        unsigned nested = 1;
 
+                       dbg("%d", __LINE__);
                        endarg = argv;
                        while (1) {
                                if (!*++endarg)
-                                       bb_error_msg_and_die("unpaired '('");
+                                       bb_simple_error_msg_and_die("unpaired '('");
                                if (LONE_CHAR(*endarg, '('))
                                        nested++;
                                else if (LONE_CHAR(*endarg, ')') && !--nested) {
@@ -693,20 +1319,24 @@ static action*** parse_params(char **argv)
 #endif
                else if (parm == PARM_name || parm == PARM_iname) {
                        action_name *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(name);
                        ap->pattern = arg1;
                        ap->iname = (parm == PARM_iname);
                }
 #if ENABLE_FEATURE_FIND_PATH
-               else if (parm == PARM_path) {
+               else if (parm == PARM_path IF_DESKTOP(|| parm == PARM_wholename) || parm == PARM_ipath) {
                        action_path *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(path);
                        ap->pattern = arg1;
+                       ap->ipath = (parm == PARM_ipath);
                }
 #endif
 #if ENABLE_FEATURE_FIND_REGEX
                else if (parm == PARM_regex) {
                        action_regex *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(regex);
                        xregcomp(&ap->compiled_pattern, arg1, 0 /*cflags*/);
                }
@@ -716,27 +1346,36 @@ static action*** parse_params(char **argv)
                        action_type *ap;
                        ap = ALLOC_ACTION(type);
                        ap->type_mask = find_type(arg1);
+                       dbg("created:type mask:%x", ap->type_mask);
+               }
+#endif
+#if ENABLE_FEATURE_FIND_EXECUTABLE
+               else if (parm == PARM_executable) {
+                       (void) ALLOC_ACTION(executable);
                }
 #endif
 #if ENABLE_FEATURE_FIND_PERM
-/* -perm mode   File's permission bits are exactly mode (octal or symbolic).
+/* -perm BITS   File's mode bits are exactly BITS (octal or symbolic).
  *              Symbolic modes use mode 0 as a point of departure.
- * -perm -mode  All of the permission bits mode are set for the file.
- * -perm +mode  Any of the permission bits mode are set for the file.
+ * -perm -BITS  All of the BITS are set in file's mode.
+ * -perm [+/]BITS  At least one of the BITS is set in file's mode.
  */
                else if (parm == PARM_perm) {
                        action_perm *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(perm);
                        ap->perm_char = arg1[0];
-                       arg1 = plus_minus_num(arg1);
-                       ap->perm_mask = 0;
-                       if (!bb_parse_mode(arg1, &ap->perm_mask))
-                               bb_error_msg_and_die("invalid mode: %s", arg1);
+                       arg1 = (arg1[0] == '/' ? arg1+1 : plus_minus_num(arg1));
+                       /*ap->perm_mask = 0; - ALLOC_ACTION did it */
+                       ap->perm_mask = bb_parse_mode(arg1, ap->perm_mask);
+                       if (ap->perm_mask == (mode_t)-1)
+                               bb_error_msg_and_die("invalid mode '%s'", arg1);
                }
 #endif
 #if ENABLE_FEATURE_FIND_MTIME
                else if (parm == PARM_mtime) {
                        action_mtime *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(mtime);
                        ap->mtime_char = arg1[0];
                        ap->mtime_days = xatoul(plus_minus_num(arg1));
@@ -745,6 +1384,7 @@ static action*** parse_params(char **argv)
 #if ENABLE_FEATURE_FIND_MMIN
                else if (parm == PARM_mmin) {
                        action_mmin *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(mmin);
                        ap->mmin_char = arg1[0];
                        ap->mmin_mins = xatoul(plus_minus_num(arg1));
@@ -754,6 +1394,7 @@ static action*** parse_params(char **argv)
                else if (parm == PARM_newer) {
                        struct stat stat_newer;
                        action_newer *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(newer);
                        xstat(arg1, &stat_newer);
                        ap->newer_mtime = stat_newer.st_mtime;
@@ -762,6 +1403,7 @@ static action*** parse_params(char **argv)
 #if ENABLE_FEATURE_FIND_INUM
                else if (parm == PARM_inum) {
                        action_inum *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(inum);
                        ap->inode_num = xatoul(arg1);
                }
@@ -769,6 +1411,7 @@ static action*** parse_params(char **argv)
 #if ENABLE_FEATURE_FIND_USER
                else if (parm == PARM_user) {
                        action_user *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(user);
                        ap->uid = bb_strtou(arg1, NULL, 10);
                        if (errno)
@@ -778,6 +1421,7 @@ static action*** parse_params(char **argv)
 #if ENABLE_FEATURE_FIND_GROUP
                else if (parm == PARM_group) {
                        action_group *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(group);
                        ap->gid = bb_strtou(arg1, NULL, 10);
                        if (errno)
@@ -806,6 +1450,7 @@ static action*** parse_params(char **argv)
                                { "", 0 }
                        };
                        action_size *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(size);
                        ap->size_char = arg1[0];
                        ap->size = XATOU_SFX(plus_minus_num(arg1), find_suffixes);
@@ -814,12 +1459,22 @@ static action*** parse_params(char **argv)
 #if ENABLE_FEATURE_FIND_CONTEXT
                else if (parm == PARM_context) {
                        action_context *ap;
+                       dbg("%d", __LINE__);
                        ap = ALLOC_ACTION(context);
-                       ap->context = NULL;
+                       /*ap->context = NULL; - ALLOC_ACTION did it */
                        /* SELinux headers erroneously declare non-const parameter */
                        if (selinux_raw_to_trans_context((char*)arg1, &ap->context))
                                bb_simple_perror_msg(arg1);
                }
+#endif
+#if ENABLE_FEATURE_FIND_LINKS
+               else if (parm == PARM_links) {
+                       action_links *ap;
+                       dbg("%d", __LINE__);
+                       ap = ALLOC_ACTION(links);
+                       ap->links_char = arg1[0];
+                       ap->links_count = xatoul(plus_minus_num(arg1));
+               }
 #endif
                else {
                        bb_error_msg("unrecognized: %s", arg);
@@ -827,110 +1482,101 @@ static action*** parse_params(char **argv)
                }
                argv++;
        }
+       dbg("exiting %s", __func__);
        return appp;
 #undef ALLOC_ACTION
+#undef appp
+#undef cur_action
+#undef invert_flag
 }
 
-
 int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int find_main(int argc, char **argv)
+int find_main(int argc UNUSED_PARAM, char **argv)
 {
-       static const char options[] ALIGN1 =
-                         "-follow\0"
-IF_FEATURE_FIND_XDEV(    "-xdev\0"    )
-IF_FEATURE_FIND_MAXDEPTH("-mindepth\0""-maxdepth\0")
-                         ;
-       enum {
-                         OPT_FOLLOW,
-IF_FEATURE_FIND_XDEV(    OPT_XDEV    ,)
-IF_FEATURE_FIND_MAXDEPTH(OPT_MINDEPTH,)
-       };
-
-       char *arg;
-       char **argp;
-       int i, firstopt, status = EXIT_SUCCESS;
-#if ENABLE_FEATURE_FIND_MAXDEPTH
-       int minmaxdepth[2] = { 0, INT_MAX };
-#else
-#define minmaxdepth NULL
-#endif
+       int i, firstopt;
+       char **past_HLP, *saved;
 
        INIT_G();
 
-       for (firstopt = 1; firstopt < argc; firstopt++) {
+       /* "find -type f" + getopt("+HLP") => disaster.
+        * Need to avoid getopt running into a non-HLP option.
+        * Do this by temporarily storing NULL there:
+        */
+       past_HLP = argv;
+       for (;;) {
+               saved = *++past_HLP;
+               if (!saved)
+                       break;
+               if (saved[0] != '-')
+                       break;
+               if (!saved[1])
+                       break; /* it is "-" */
+               if (saved[1] == '-' && !saved[2]) {
+                       /* it is "--" */
+                       /* Try: find -- /dev/null */
+                       saved = *++past_HLP;
+                       break;
+               }
+               if ((saved+1)[strspn(saved+1, "HLP")] != '\0')
+                       break;
+       }
+       *past_HLP = NULL;
+       /* "+": stop on first non-option */
+       i = getopt32(argv, "+HLP");
+       if (i & (1<<0))
+               G.recurse_flags |= ACTION_FOLLOWLINKS_L0 | ACTION_DANGLING_OK;
+       if (i & (1<<1))
+               G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
+       /* -P is default and is ignored */
+       argv = past_HLP; /* same result as "argv += optind;" */
+       *past_HLP = saved;
+
+       for (firstopt = 0; argv[firstopt]; firstopt++) {
                if (argv[firstopt][0] == '-')
                        break;
                if (ENABLE_FEATURE_FIND_NOT && LONE_CHAR(argv[firstopt], '!'))
                        break;
-#if ENABLE_FEATURE_FIND_PAREN
-               if (LONE_CHAR(argv[firstopt], '('))
+               if (ENABLE_FEATURE_FIND_PAREN && LONE_CHAR(argv[firstopt], '('))
                        break;
-#endif
        }
-       if (firstopt == 1) {
-               argv[0] = (char*)".";
-               argv--;
+       if (firstopt == 0) {
+               *--argv = (char*)".";
                firstopt++;
        }
 
-/* All options always return true. They always take effect
- * rather than being processed only when their place in the
- * expression is reached.
- * We implement: -follow, -xdev, -maxdepth
- */
-       /* Process options, and replace then with -a */
-       /* (-a will be ignored by recursive parser later) */
-       argp = &argv[firstopt];
-       while ((arg = argp[0])) {
-               int opt = index_in_strings(options, arg);
-               if (opt == OPT_FOLLOW) {
-                       G.recurse_flags |= ACTION_FOLLOWLINKS | ACTION_DANGLING_OK;
-                       argp[0] = (char*)"-a";
-               }
+       G.actions = parse_params(&argv[firstopt]);
+       argv[firstopt] = NULL;
+
 #if ENABLE_FEATURE_FIND_XDEV
-               if (opt == OPT_XDEV) {
-                       struct stat stbuf;
-                       if (!G.xdev_count) {
-                               G.xdev_count = firstopt - 1;
-                               G.xdev_dev = xmalloc(G.xdev_count * sizeof(dev_t));
-                               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;
-                               }
-                       }
-                       argp[0] = (char*)"-a";
-               }
-#endif
-#if ENABLE_FEATURE_FIND_MAXDEPTH
-               if (opt == OPT_MINDEPTH || opt == OPT_MINDEPTH + 1) {
-                       if (!argp[1])
-                               bb_show_usage();
-                       minmaxdepth[opt - OPT_MINDEPTH] = xatoi_u(argp[1]);
-                       argp[0] = (char*)"-a";
-                       argp[1] = (char*)"-a";
-                       argp++;
+       if (G.xdev_on) {
+               struct stat stbuf;
+
+               G.xdev_count = firstopt;
+               G.xdev_dev = xzalloc(G.xdev_count * sizeof(G.xdev_dev[0]));
+               for (i = 0; argv[i]; i++) {
+                       /* not xstat(): shouldn't bomb out on
+                        * "find not_exist exist -xdev" */
+                       if (stat(argv[i], &stbuf) == 0)
+                               G.xdev_dev[i] = stbuf.st_dev;
+                       /* else G.xdev_dev[i] stays 0 and
+                        * won't match any real device dev_t
+                        */
                }
-#endif
-               argp++;
        }
+#endif
 
-       G.actions = parse_params(&argv[firstopt]);
-
-       for (i = 1; i < firstopt; i++) {
+       for (i = 0; argv[i]; i++) {
                if (!recursive_action(argv[i],
                                G.recurse_flags,/* flags */
                                fileAction,     /* file action */
                                fileAction,     /* dir action */
-#if ENABLE_FEATURE_FIND_MAXDEPTH
-                               minmaxdepth,    /* user data */
-#else
                                NULL,           /* user data */
-#endif
-                               0))             /* depth */
-                       status = EXIT_FAILURE;
+                               0)              /* depth */
+               ) {
+                       G.exitstatus |= EXIT_FAILURE;
+               }
        }
-       return status;
+
+       IF_FEATURE_FIND_EXEC_PLUS(G.exitstatus |= flush_exec_plus();)
+       return G.exitstatus;
 }