Merge branch 'busybox'

4 files changed, 62 insertions, 9 deletions

diff --git a/findutils/Config.src b/findutils/Config.src
index 9ee71a845..c28c5844e 100644
--- a/findutils/Config.src
+++ b/findutils/Config.src
@@ -1,6 +1,6 @@
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Finding Utilities"
diff --git a/findutils/find.c b/findutils/find.c
index 07321c81a..6407c6c5a 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -95,6 +95,11 @@
 //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
@@ -182,6 +187,13 @@
 //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
@@ -265,6 +277,9 @@
 //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"
@@ -318,6 +333,9 @@
 //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"
@@ -365,6 +383,7 @@ 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;))
@@ -375,6 +394,7 @@ 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; /* -exec ARGS */
@@ -402,6 +422,7 @@ struct globals {
         action ***actions;
         smallint need_print;
         smallint xdev_on;
+        smalluint exitstatus;
         recurse_flags_t recurse_flags;
         IF_FEATURE_FIND_EXEC_PLUS(unsigned max_argv_len;)
 } FIX_ALIASING;
@@ -566,6 +587,12 @@ 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)
 {
@@ -774,6 +801,12 @@ ACTF(prune)
         return SKIP + TRUE;
 }
 #endif
+#if ENABLE_FEATURE_FIND_QUIT
+ACTF(quit)
+{
+        exit(G.exitstatus);
+}
+#endif
 #if ENABLE_FEATURE_FIND_DELETE
 ACTF(delete)
 {
@@ -954,8 +987,10 @@ static action*** parse_params(char **argv)
                                 PARM_print     ,
         IF_FEATURE_FIND_PRINT0( PARM_print0    ,)
         IF_FEATURE_FIND_PRUNE(  PARM_prune     ,)
+        IF_FEATURE_FIND_QUIT(   PARM_quit      ,)
         IF_FEATURE_FIND_DELETE( PARM_delete    ,)
         IF_FEATURE_FIND_EXEC(   PARM_exec      ,)
+        IF_FEATURE_FIND_EXECUTABLE(PARM_executable,)
         IF_FEATURE_FIND_PAREN(  PARM_char_brace,)
         /* All options/actions starting from here require argument */
                                 PARM_name      ,
@@ -997,8 +1032,10 @@ static action*** parse_params(char **argv)
                                 "-print\0"
         IF_FEATURE_FIND_PRINT0( "-print0\0" )
         IF_FEATURE_FIND_PRUNE(  "-prune\0"  )
+        IF_FEATURE_FIND_QUIT(   "-quit\0"  )
         IF_FEATURE_FIND_DELETE( "-delete\0" )
         IF_FEATURE_FIND_EXEC(   "-exec\0"   )
+        IF_FEATURE_FIND_EXECUTABLE("-executable\0")
         IF_FEATURE_FIND_PAREN(  "(\0"       )
         /* All options/actions starting from here require argument */
                                 "-name\0"
@@ -1152,6 +1189,12 @@ static action*** parse_params(char **argv)
                         (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__);
@@ -1262,6 +1305,11 @@ static action*** parse_params(char **argv)
                         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 BITS   File's mode bits are exactly BITS (octal or symbolic).
  *              Symbolic modes use mode 0 as a point of departure.
@@ -1401,7 +1449,7 @@ static action*** parse_params(char **argv)
 int find_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int find_main(int argc UNUSED_PARAM, char **argv)
 {
-        int i, firstopt, status = EXIT_SUCCESS;
+        int i, firstopt;
         char **past_HLP, *saved;
 
         INIT_G();
@@ -1475,10 +1523,10 @@ int find_main(int argc UNUSED_PARAM, char **argv)
                                 NULL,           /* user data */
                                 0)              /* depth */
                 ) {
-                        status |= EXIT_FAILURE;
+                        G.exitstatus |= EXIT_FAILURE;
                 }
         }
 
-        IF_FEATURE_FIND_EXEC_PLUS(status |= flush_exec_plus();)
-        return status;
+        IF_FEATURE_FIND_EXEC_PLUS(G.exitstatus |= flush_exec_plus();)
+        return G.exitstatus;
 }
diff --git a/findutils/grep.c b/findutils/grep.c
index 88de0d4ef..3e8ea9239 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -704,10 +704,15 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
         /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
         /* -H unsets -h; -C unsets -A,-B */
-        opts = getopt32(argv,
-                "^" OPTSTR_GREP "\0" "H-h:C-AB",
+        opts = getopt32long(argv, "^"
+                OPTSTR_GREP
+                        "\0"
+                        "H-h:C-AB",
+                "color\0" Optional_argument "\xff",
                 &pattern_head, &fopt, &max_matches,
-                &lines_after, &lines_before, &Copt);
+                &lines_after, &lines_before, &Copt
+                , NULL
+        );
 
         if (opts & OPT_C) {
                 /* -C unsets prev -A and -B, but following -A or -B
diff --git a/findutils/xargs.c b/findutils/xargs.c
index df2300207..4399783ea 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -606,7 +606,7 @@ static int xargs_ask_confirmation(void)
 //usage:        )
 //usage:     "\n        -r      Don't run command if input is empty"
 //usage:        IF_FEATURE_XARGS_SUPPORT_ZERO_TERM(
-//usage:     "\n        -0      Input is separated by NUL characters"
+//usage:     "\n        -0      Input is separated by NULs"
 //usage:        )
 //usage:        IF_FEATURE_XARGS_SUPPORT_ARGS_FILE(
 //usage:     "\n        -a FILE Read from FILE instead of stdin"