Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/findutils/grep.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/findutils/grep.c (modified) (13 diffs)

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

@@ -19 +19 @@
  */
 
-//applet:IF_GREP(APPLET(grep, _BB_DIR_BIN, _BB_SUID_DROP))
-//applet:IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, egrep))
-//applet:IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, _BB_DIR_BIN, _BB_SUID_DROP, fgrep))
+//applet:IF_GREP(APPLET(grep, BB_DIR_BIN, BB_SUID_DROP))
+//applet:IF_FEATURE_GREP_EGREP_ALIAS(APPLET_ODDNAME(egrep, grep, BB_DIR_BIN, BB_SUID_DROP, egrep))
+//applet:IF_FEATURE_GREP_FGREP_ALIAS(APPLET_ODDNAME(fgrep, grep, BB_DIR_BIN, BB_SUID_DROP, fgrep))
 
 //kbuild:lib-$(CONFIG_GREP) += grep.o
@@ -73 +73 @@
 //usage:#define grep_full_usage "\n\n"
 //usage:       "Search for PATTERN in FILEs (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n    -H  Add 'filename:' prefix"
 //usage:     "\n    -h  Do not add 'filename:' prefix"
@@ -87 +86 @@
 //usage:     "\n    -i  Ignore case"
 //usage:     "\n    -w  Match whole words only"
+//usage:     "\n    -x  Match whole lines only"
 //usage:     "\n    -F  PATTERN is a literal (not regexp)"
 //usage:    IF_FEATURE_GREP_EGREP_ALIAS(
@@ -115 +115 @@
 
 #define OPTSTR_GREP \
-    "lnqvscFiHhe:f:Lorm:w" \
+    "lnqvscFiHhe:f:Lorm:wx" \
     IF_FEATURE_GREP_CONTEXT("A:B:C:") \
     IF_FEATURE_GREP_EGREP_ALIAS("E") \
@@ -140 +140 @@
     OPTBIT_m, /* -m MAX_MATCHES */
     OPTBIT_w, /* -w whole word match */
+    OPTBIT_x, /* -x whole line match */
     IF_FEATURE_GREP_CONTEXT(    OPTBIT_A ,) /* -A NUM: after-match context */
     IF_FEATURE_GREP_CONTEXT(    OPTBIT_B ,) /* -B NUM: before-match context */
@@ -162 +163 @@
     OPT_m = 1 << OPTBIT_m,
     OPT_w = 1 << OPTBIT_w,
+    OPT_x = 1 << OPTBIT_x,
     OPT_A = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_A)) + 0,
     OPT_B = IF_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_B)) + 0,
@@ -343 +345 @@
             gl = (grep_list_data_t *)pattern_ptr->data;
             if (FGREP_FLAG) {
-                found |= (((option_mask32 & OPT_i)
-                    ? strcasestr(line, gl->pattern)
-                    : strstr(line, gl->pattern)
-                    ) != NULL);
+                char *match;
+                char *str = line;
+ opt_f_again:
+                match = ((option_mask32 & OPT_i)
+                    ? strcasestr(str, gl->pattern)
+                    : strstr(str, gl->pattern)
+                    );
+                if (match) {
+                    if (option_mask32 & OPT_x) {
+                        if (match != str)
+                            goto opt_f_not_found;
+                        if (str[strlen(gl->pattern)] != '\0')
+                            goto opt_f_not_found;
+                    } else
+                    if (option_mask32 & OPT_w) {
+                        char c = (match != str) ? match[-1] : ' ';
+                        if (!isalnum(c) && c != '_') {
+                            c = match[strlen(gl->pattern)];
+                            if (!c || (!isalnum(c) && c != '_'))
+                                goto opt_f_found;
+                        }
+                        str = match + 1;
+                        goto opt_f_again;
+                    }
+ opt_f_found:
+                    found = 1;
+ opt_f_not_found: ;
+                }
             } else {
                 if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
@@ -372 +398 @@
 #endif
                 ) {
-                    if (!(option_mask32 & OPT_w))
+                    if (option_mask32 & OPT_x) {
+                        found = (gl->matched_range.rm_so == 0
+                                 && line[gl->matched_range.rm_eo] == '\0');
+                    } else
+                    if (!(option_mask32 & OPT_w)) {
                         found = 1;
-                    else {
+                    } else {
                         char c = ' ';
                         if (gl->matched_range.rm_so)
@@ -383 +413 @@
                                 found = 1;
                         }
+//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
+//we bail out on first "mismatch" because it's not a word.
                     }
                 }
@@ -564 +596 @@
 static void load_regexes_from_file(llist_t *fopt)
 {
-    char *line;
-    FILE *f;
-
     while (fopt) {
+        char *line;
+        FILE *fp;
         llist_t *cur = fopt;
         char *ffile = cur->data;
@@ -573 +604 @@
         fopt = cur->link;
         free(cur);
-        f = xfopen_stdin(ffile);
-        while ((line = xmalloc_fgetline(f)) != NULL) {
+        fp = xfopen_stdin(ffile);
+        while ((line = xmalloc_fgetline(fp)) != NULL) {
             llist_add_to(&pattern_head,
                 new_grep_list_data(line, ALLOCATED));
         }
+        fclose_if_not_stdin(fp);
     }
 }
@@ -634 +666 @@
     if (opts & OPT_C) {
         /* -C unsets prev -A and -B, but following -A or -B
-           may override it */
+         * may override it */
         if (!(opts & OPT_A)) /* not overridden */
             lines_after = Copt;
@@ -661 +693 @@
     invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
 
-    if (pattern_head != NULL) {
-        /* convert char **argv to grep_list_data_t */
+    {   /* convert char **argv to grep_list_data_t */
         llist_t *cur;
-
         for (cur = pattern_head; cur; cur = cur->link)
             cur->data = new_grep_list_data(cur->data, 0);
     }
-    if (option_mask32 & OPT_f)
+    if (option_mask32 & OPT_f) {
         load_regexes_from_file(fopt);
+        if (!pattern_head) { /* -f EMPTY_FILE? */
+            /* GNU grep treats it as "nothing matches" */
+            llist_add_to(&pattern_head, new_grep_list_data((char*) "", 0));
+            invert_search ^= 1;
+        }
+    }
 
     if (ENABLE_FEATURE_GREP_FGREP_ALIAS && applet_name[0] == 'f')