Merge branch 'origin/master' (early part)

4 files changed, 25 insertions, 17 deletions

diff --git a/findutils/Kbuild.src b/findutils/Kbuild.src
index 771789ff5..6b4fb7470 100644
--- a/findutils/Kbuild.src
+++ b/findutils/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
 lib-y:=
 
diff --git a/findutils/find.c b/findutils/find.c
index d4bcd6545..dd00f37ea 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -7,7 +7,7 @@
  * 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:
@@ -748,13 +748,13 @@ static action*** parse_params(char **argv)
 
         /* 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][cur_action++] = ap = xzalloc(sizeof_struct);
                 appp[cur_group][cur_action] = NULL;
                 ap->f = f;
                 IF_FEATURE_FIND_NOT( ap->invert = invert_flag; )
@@ -854,16 +854,20 @@ static action*** parse_params(char **argv)
                         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 ';' or '+' until end */
                                         bb_error_msg_and_die(bb_msg_requires_arg, "-exec");
-                                if (LONE_CHAR(argv[0], ';'))
+                                // find -exec echo Foo ">{}<" ";"
+                                // executes "echo Foo <filename>",
+                                // find -exec echo Foo ">{}<" "+"
+                                // executes "echo Foo <filename1> <filename2> <filename3>...".
+                                // TODO (so far we treat "+" just like ";")
+                                if ((argv[0][0] == ';' || argv[0][0] == '+')
+                                 && argv[0][1] == '\0'
+                                ) {
                                         break;
-                                //TODO: implement {} + (like xargs)
-                                // See:
-                                // find findutils/ -exec echo ">"{}"<" \;
-                                // find findutils/ -exec echo ">"{}"<" +
+                                }
                                 argv++;
                                 ap->exec_argc++;
                         }
@@ -936,7 +940,7 @@ static action*** parse_params(char **argv)
                         ap = ALLOC_ACTION(perm);
                         ap->perm_char = arg1[0];
                         arg1 = plus_minus_num(arg1);
-                        ap->perm_mask = 0;
+                        /*ap->perm_mask = 0; - ALLOC_ACTION did it */
                         if (!bb_parse_mode(arg1, &ap->perm_mask))
                                 bb_error_msg_and_die("invalid mode '%s'", arg1);
                 }
@@ -1022,7 +1026,7 @@ static action*** parse_params(char **argv)
                 else if (parm == PARM_context) {
                         action_context *ap;
                         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);
diff --git a/findutils/grep.c b/findutils/grep.c
index 9eb5e5a1b..bf42753c5 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -5,7 +5,7 @@
  * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
  * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 /* BB_AUDIT SUSv3 defects - unsupported option -x "match whole line only". */
 /* BB_AUDIT GNU defects - always acts as -a.  */
@@ -469,15 +469,19 @@ static int grep_file(FILE *file)
                                                 if (found)
                                                         print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
                                         } else while (1) {
+                                                unsigned start = gl->matched_range.rm_so;
                                                 unsigned end = gl->matched_range.rm_eo;
+                                                unsigned len = end - start;
                                                 char old = line[end];
                                                 line[end] = '\0';
-                                                print_line(line + gl->matched_range.rm_so,
-                                                                end - gl->matched_range.rm_so,
-                                                                linenum, ':');
+                                                /* Empty match is not printed: try "echo test | grep -o ''" */
+                                                if (len != 0)
+                                                        print_line(line + start, len, linenum, ':');
                                                 if (old == '\0')
                                                         break;
                                                 line[end] = old;
+                                                if (len == 0)
+                                                        end++;
 #if !ENABLE_EXTRA_COMPAT
                                                 if (regexec(&gl->compiled_regex, line + end,
                                                                 1, &gl->matched_range, REG_NOTBOL) != 0)
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 7b9f1fb73..d73fad9de 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -9,7 +9,7 @@
  * - Mike Rendell <michael@cs.mun.ca>
  * and David MacKenzie <djm@gnu.ai.mit.edu>.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * xargs is described in the Single Unix Specification v3 at
  * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html