[grep] solve mac-specific problem

Author: Wandalen

text/src/grep.rs

@@ -145,6 +145,8 @@ impl Args {
             .iter()
             .flat_map(|pattern| pattern.split('\n').map(String::from))
             .collect();
+        self.regexp.sort_by_key(|r| r.len());
+        self.regexp.dedup();
 
         if self.input_files.is_empty() {
             self.input_files.push(String::from("-"))
@@ -254,8 +256,22 @@ impl Patterns {
             if ignore_case {
                 cflags |= REG_ICASE;
             }
-            for p in patterns {
-                let pattern = if line_regexp { format!("^{p}$") } else { p };
+            for mut pattern in patterns {
+                /// macOS version of [regcomp](regcomp) from `libc` provides additional check for empty regex. In this case, an error [REG_EMPTY](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/regcomp.3.html) will be returned.
+                /// Therefore, an empty pattern is replaced with ".*".
+                #[cfg(target_os = "macos")]
+                {
+                    pattern = if pattern == "" {
+                        String::from(".*")
+                    } else {
+                        pattern
+                    };
+                }
+                pattern = if line_regexp {
+                    format!("^{pattern}$")
+                } else {
+                    pattern
+                };
 
                 let c_pattern = CString::new(pattern).map_err(|err| err.to_string())?;
                 let mut regex = unsafe { std::mem::zeroed::<regex_t>() };
@@ -315,7 +331,7 @@ impl Drop for Patterns {
             Patterns::Fixed(_, _, _) => {}
             Patterns::Regex(regexes) => {
                 for regex in regexes {
-                    unsafe { regfree(regex as *const _ as *mut _) }
+                    unsafe { regfree(regex as *const regex_t as *mut regex_t) }
                 }
             }
         }

text/tests/grep/mod.rs

@@ -12,6 +12,7 @@ use plib::testing::{run_test, TestPlan};
 
 const LINES_INPUT: &str =
     "line_{1}\np_line_{2}_s\n  line_{3}  \nLINE_{4}\np_LINE_{5}_s\nl_{6}\nline_{70}\n";
+const EMPTY_LINES_INPUT: &str = "\n\n\n";
 const BAD_INPUT: &str = "(some text)\n";
 
 const INPUT_FILE_1: &str = "tests/grep/f_1";
@@ -1191,26 +1192,31 @@ fn test_empty_basic_regexp_01() {
 
 #[test]
 fn test_empty_basic_regexp_02() {
-    grep_test(&["-e", ""], LINES_INPUT, LINES_INPUT, "", 0);
+    grep_test(&[""], EMPTY_LINES_INPUT, EMPTY_LINES_INPUT, "", 0);
 }
 
 #[test]
 fn test_empty_basic_regexp_03() {
-    grep_test(&["-f", EMPTY_PATTERN_FILE], LINES_INPUT, LINES_INPUT, "", 0);
+    grep_test(&["-e", ""], LINES_INPUT, LINES_INPUT, "", 0);
 }
 
 #[test]
 fn test_empty_basic_regexp_04() {
-    grep_test(&[""], "", "", "", 1);
+    grep_test(&["-f", EMPTY_PATTERN_FILE], LINES_INPUT, LINES_INPUT, "", 0);
 }
 
 #[test]
 fn test_empty_basic_regexp_05() {
-    grep_test(&["-e", ""], "", "", "", 1);
+    grep_test(&[""], "", "", "", 1);
 }
 
 #[test]
 fn test_empty_basic_regexp_06() {
+    grep_test(&["-e", ""], "", "", "", 1);
+}
+
+#[test]
+fn test_empty_basic_regexp_07() {
     grep_test(&["-f", EMPTY_PATTERN_FILE], "", "", "", 1);
 }
 
@@ -1221,11 +1227,16 @@ fn test_empty_extended_regexp_01() {
 
 #[test]
 fn test_empty_extended_regexp_02() {
-    grep_test(&["-E", "-e", ""], LINES_INPUT, LINES_INPUT, "", 0);
+    grep_test(&["-E", ""], EMPTY_LINES_INPUT, EMPTY_LINES_INPUT, "", 0);
 }
 
 #[test]
 fn test_empty_extended_regexp_03() {
+    grep_test(&["-E", "-e", ""], LINES_INPUT, LINES_INPUT, "", 0);
+}
+
+#[test]
+fn test_empty_extended_regexp_04() {
     grep_test(
         &["-E", "-f", EMPTY_PATTERN_FILE],
         LINES_INPUT,
@@ -1236,17 +1247,17 @@ fn test_empty_extended_regexp_03() {
 }
 
 #[test]
-fn test_empty_extended_regexp_04() {
+fn test_empty_extended_regexp_05() {
     grep_test(&["-E", ""], "", "", "", 1);
 }
 
 #[test]
-fn test_empty_extended_regexp_05() {
+fn test_empty_extended_regexp_06() {
     grep_test(&["-E", "-e", ""], "", "", "", 1);
 }
 
 #[test]
-fn test_empty_extended_regexp_06() {
+fn test_empty_extended_regexp_07() {
     grep_test(&["-E", "-f", EMPTY_PATTERN_FILE], "", "", "", 1);
 }
 
@@ -1257,11 +1268,16 @@ fn test_empty_fixed_strings_01() {
 
 #[test]
 fn test_empty_fixed_strings_02() {
-    grep_test(&["-F", "-e", ""], LINES_INPUT, LINES_INPUT, "", 0);
+    grep_test(&["-E", ""], EMPTY_LINES_INPUT, EMPTY_LINES_INPUT, "", 0);
 }
 
 #[test]
 fn test_empty_fixed_strings_03() {
+    grep_test(&["-F", "-e", ""], LINES_INPUT, LINES_INPUT, "", 0);
+}
+
+#[test]
+fn test_empty_fixed_strings_04() {
     grep_test(
         &["-F", "-f", EMPTY_PATTERN_FILE],
         LINES_INPUT,
@@ -1272,17 +1288,17 @@ fn test_empty_fixed_strings_03() {
 }
 
 #[test]
-fn test_empty_fixed_strings_04() {
+fn test_empty_fixed_strings_05() {
     grep_test(&["-F", ""], "", "", "", 1);
 }
 
 #[test]
-fn test_empty_fixed_strings_05() {
+fn test_empty_fixed_strings_06() {
     grep_test(&["-F", "-e", ""], "", "", "", 1);
 }
 
 #[test]
-fn test_empty_fixed_strings_06() {
+fn test_empty_fixed_strings_07() {
     grep_test(&["-F", "-f", EMPTY_PATTERN_FILE], "", "", "", 1);
 }