Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/findutils/grep.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/findutils/grep.c (modified) (9 diffs)

branches/3.3/mindi-busybox/findutils/grep.c

@@ -59 +59 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "xregex.h"
 
@@ -202 +203 @@
     const char *cur_file;    /* the current file we are reading */
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#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); \
 } while (0)
 #define max_matches       (G.max_matches         )
@@ -374 +374 @@
                 }
             } else {
+#if ENABLE_EXTRA_COMPAT
+                unsigned start_pos;
+#else
+                int match_flg;
+#endif
+                char *match_at;
+
                 if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
                     gl->flg_mem_alocated_compiled |= COMPILED;
@@ -388 +395 @@
                 gl->matched_range.rm_so = 0;
                 gl->matched_range.rm_eo = 0;
-#endif
+                match_flg = 0;
+#else
+                start_pos = 0;
+#endif
+                match_at = line;
+ opt_w_again:
+//bb_error_msg("'%s' start_pos:%d line_len:%d", match_at, start_pos, line_len);
                 if (
 #if !ENABLE_EXTRA_COMPAT
-                    regexec(&gl->compiled_regex, line, 1, &gl->matched_range, 0) == 0
-#else
-                    re_search(&gl->compiled_regex, line, line_len,
-                            /*start:*/ 0, /*range:*/ line_len,
+                    regexec(&gl->compiled_regex, match_at, 1, &gl->matched_range, match_flg) == 0
+#else
+                    re_search(&gl->compiled_regex, match_at, line_len,
+                            start_pos, /*range:*/ line_len,
                             &gl->matched_range) >= 0
 #endif
@@ -400 +413 @@
                     if (option_mask32 & OPT_x) {
                         found = (gl->matched_range.rm_so == 0
-                                 && line[gl->matched_range.rm_eo] == '\0');
+                                 && match_at[gl->matched_range.rm_eo] == '\0');
                     } else
                     if (!(option_mask32 & OPT_w)) {
@@ -406 +419 @@
                     } else {
                         char c = ' ';
-                        if (gl->matched_range.rm_so)
-                            c = line[gl->matched_range.rm_so - 1];
+                        if (match_at > line || gl->matched_range.rm_so != 0) {
+                            c = match_at[gl->matched_range.rm_so - 1];
+                        }
                         if (!isalnum(c) && c != '_') {
-                            c = line[gl->matched_range.rm_eo];
-                            if (!c || (!isalnum(c) && c != '_'))
-                                found = 1;
+                            c = match_at[gl->matched_range.rm_eo];
                         }
-//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
-//we bail out on first "mismatch" because it's not a word.
+                        if (!isalnum(c) && c != '_') {
+                            found = 1;
+                        } else {
+            /*
+             * Why check gl->matched_range.rm_eo?
+             * Zero-length match makes -w skip the line:
+             * "echo foo | grep ^" prints "foo",
+             * "echo foo | grep -w ^" prints nothing.
+             * Without such check, we can loop forever.
+             */
+#if !ENABLE_EXTRA_COMPAT
+                            if (gl->matched_range.rm_eo != 0) {
+                                match_at += gl->matched_range.rm_eo;
+                                match_flg |= REG_NOTBOL;
+                                goto opt_w_again;
+                            }
+#else
+                            if (gl->matched_range.rm_eo > start_pos) {
+                                start_pos = gl->matched_range.rm_eo;
+                                goto opt_w_again;
+                            }
+#endif
+                        }
                     }
                 }
@@ -636 +669 @@
     recursive_action(dir,
         /* recurse=yes */ ACTION_RECURSE |
-        /* followLinks=no */
+        /* followLinks=command line only */ ACTION_FOLLOWLINKS_L0 |
         /* depthFirst=yes */ ACTION_DEPTHFIRST,
         /* fileAction= */ file_action_grep,
@@ -651 +684 @@
     int matched;
     llist_t *fopt = NULL;
+#if ENABLE_FEATURE_GREP_CONTEXT
+    int Copt, opts;
+#endif
+    INIT_G();
+
+    /* For grep, exitcode of 1 is "not found". Other errors are 2: */
+    xfunc_error_retval = 2;
 
     /* do normal option parsing */
 #if ENABLE_FEATURE_GREP_CONTEXT
-    int Copt, opts;
-
     /* -H unsets -h; -C unsets -A,-B; -e,-f are lists;
      * -m,-A,-B,-C have numeric param */
@@ -711 +749 @@
 
 #if !ENABLE_EXTRA_COMPAT
-    if (!(option_mask32 & (OPT_o | OPT_w)))
+    if (!(option_mask32 & (OPT_o | OPT_w | OPT_x)))
         reflags = REG_NOSUB;
 #endif