Merge branch 'busybox' into merge

3 files changed, 10 insertions, 4 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 6407c6c5a..06ad1b39c 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -1467,6 +1467,12 @@ int find_main(int argc UNUSED_PARAM, char **argv)
                         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;
         }
diff --git a/findutils/grep.c b/findutils/grep.c
index 3e8ea9239..a4033a40b 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -18,19 +18,19 @@
  * (C) 2006 Jac Goudsmit added -o option
  */
 //config:config GREP
-//config:       bool "grep (8.5 kb)"
+//config:       bool "grep (8.6 kb)"
 //config:       default y
 //config:       help
 //config:       grep is used to search files for a specified pattern.
 //config:
 //config:config EGREP
-//config:       bool "egrep (7.6 kb)"
+//config:       bool "egrep (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "grep -E".
 //config:
 //config:config FGREP
-//config:       bool "fgrep (7.6 kb)"
+//config:       bool "fgrep (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       Alias to "grep -F".
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 6df8a035d..d014669bd 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -15,7 +15,7 @@
  * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html
  */
 //config:config XARGS
-//config:       bool "xargs (6.7 kb)"
+//config:       bool "xargs (7.2 kb)"
 //config:       default y
 //config:       help
 //config:       xargs is used to execute a specified command for