Merge branch 'busybox' into merge

2 files changed, 51 insertions, 3 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 66ad36283..121f8fd03 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -203,6 +203,14 @@
 //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
@@ -315,6 +323,9 @@
 //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:        )
@@ -396,6 +407,7 @@ 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_EMPTY(  ACTS(empty))
 IF_FEATURE_FIND_EXEC(   ACTS(exec,
                                 char **exec_argv; /* -exec ARGS */
                                 unsigned *subst_count;
@@ -824,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)
 {
@@ -989,6 +1025,7 @@ static action*** parse_params(char **argv)
         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,)
@@ -1034,6 +1071,7 @@ static action*** parse_params(char **argv)
         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"       )
@@ -1203,6 +1241,12 @@ static action*** parse_params(char **argv)
                         (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;
diff --git a/findutils/grep.c b/findutils/grep.c
index 2cbe7ea91..5b8644c36 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -60,7 +60,7 @@
 
 /* options */
 //usage:#define grep_trivial_usage
-//usage:       "[-HhnlLoqvsriwFE"
+//usage:       "[-HhnlLoqvsrRiwFE"
 //usage:        IF_EXTRA_COMPAT("z")
 //usage:       "] [-m N] "
 //usage:        IF_FEATURE_GREP_CONTEXT("[-A/B/C N] ")
@@ -78,6 +78,7 @@
 //usage:     "\n        -v      Select non-matching lines"
 //usage:     "\n        -s      Suppress open and read errors"
 //usage:     "\n        -r      Recurse"
+//usage:     "\n        -R      Recurse and dereference symlinks"
 //usage:     "\n        -i      Ignore case"
 //usage:     "\n        -w      Match whole words only"
 //usage:     "\n        -x      Match whole lines only"
@@ -108,7 +109,7 @@
 
 /* -e,-f are lists; -m,-A,-B,-C have numeric param */
 #define OPTSTR_GREP \
-        "lnqvscFiHhe:*f:*Lorm:+wx" \
+        "lnqvscFiHhe:*f:*LorRm:+wx" \
         IF_FEATURE_GREP_CONTEXT("A:+B:+C:+") \
         "E" \
         IF_EXTRA_COMPAT("z") \
@@ -131,6 +132,7 @@ enum {
         OPTBIT_L, /* list unmatched file names only */
         OPTBIT_o, /* show only matching parts of lines */
         OPTBIT_r, /* recurse dirs */
+        OPTBIT_R, /* recurse dirs and symlinks to dirs */
         OPTBIT_m, /* -m MAX_MATCHES */
         OPTBIT_w, /* -w whole word match */
         OPTBIT_x, /* -x whole line match */
@@ -154,6 +156,7 @@ enum {
         OPT_L = 1 << OPTBIT_L,
         OPT_o = 1 << OPTBIT_o,
         OPT_r = 1 << OPTBIT_r,
+        OPT_R = 1 << OPTBIT_R,
         OPT_m = 1 << OPTBIT_m,
         OPT_w = 1 << OPTBIT_w,
         OPT_x = 1 << OPTBIT_x,
@@ -687,6 +690,7 @@ static int grep_dir(const char *dir)
         int matched = 0;
         recursive_action(dir,
                 /* recurse=yes */ ACTION_RECURSE |
+                /* followLinks=always */ ((option_mask32 & OPT_R) ? ACTION_FOLLOWLINKS : 0) |
                 /* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 |
                 /* depthFirst=yes */ ACTION_DEPTHFIRST,
                 /* fileAction= */ file_action_grep,
@@ -827,7 +831,7 @@ int grep_main(int argc UNUSED_PARAM, char **argv)
                 if (!cur_file || LONE_DASH(cur_file)) {
                         cur_file = "(standard input)";
                 } else {
-                        if (option_mask32 & OPT_r) {
+                        if (option_mask32 & (OPT_r|OPT_R)) {
                                 struct stat st;
                                 if (stat(cur_file, &st) == 0 && S_ISDIR(st.st_mode)) {
                                         if (!(option_mask32 & OPT_h))