released 4.5.1 fix bzip3/7zip configure interference

Reported here: Genivia/ugrep-indexer#9
Genivia · Jan 6, 2024 · 68ea92a · 68ea92a
1 parent 7f18bb9
commit 68ea92a
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -5353,7 +5353,7 @@ in markdown:
 
 
 
-    ugrep 4.5.0                      January 5, 2024                        UGREP(1)
+    ugrep 4.5.1                      January 6, 2024                        UGREP(1)
 
 🔝 [Back to table of contents](#toc)
 

diff --git a/bin/win32/ug.exe b/bin/win32/ug.exe
diff --git a/bin/win32/ugrep.exe b/bin/win32/ugrep.exe
diff --git a/bin/win64/ug.exe b/bin/win64/ug.exe
diff --git a/bin/win64/ugrep.exe b/bin/win64/ugrep.exe
diff --git a/man/ugrep.1 b/man/ugrep.1
@@ -1,4 +1,4 @@
-.TH UGREP "1" "January 05, 2024" "ugrep 4.5.0" "User Commands"
+.TH UGREP "1" "January 06, 2024" "ugrep 4.5.1" "User Commands"
 .SH NAME
 \fBugrep\fR, \fBug\fR -- file pattern searcher
 .SH SYNOPSIS

diff --git a/src/output.cpp b/src/output.cpp
@@ -1243,14 +1243,22 @@ bool Output::format(const char *format, const char *pathname, const std::string&
         break;
 
       case 'Z':
-        if (flag_fuzzy > 0 && !flag_match)
+        if (flag_fuzzy > 0)
         {
-          // -Z: we used the fuzzy matcher to search, so a dynamic cast is fine
-          reflex::FuzzyMatcher *fuzzy_matcher = dynamic_cast<reflex::FuzzyMatcher*>(matcher);
-          if (!flag_files_with_matches && !flag_count)
-            num(fuzzy_matcher->edits());
+          if (!flag_match)
+          {
+            // -Z: we used the fuzzy matcher to search, so a dynamic cast is fine
+            reflex::FuzzyMatcher *fuzzy_matcher = dynamic_cast<reflex::FuzzyMatcher*>(matcher);
+            if (!flag_files_with_matches && !flag_count)
+              num(fuzzy_matcher->edits());
+            else
+              num(fuzzy_matcher->distance() & 0xff);
+          }
           else
-            num(fuzzy_matcher->distance() & 0xff);
+          {
+            // --match all
+            chr('0');
+          }
         }
         break;
 

diff --git a/src/ugrep.hpp b/src/ugrep.hpp
@@ -38,7 +38,7 @@
 #define UGREP_HPP
 
 // ugrep version
-#define UGREP_VERSION "4.5.0"
+#define UGREP_VERSION "4.5.1"
 
 // disable mmap because mmap is almost always slower than the file reading speed improvements since 3.0.0
 #define WITH_NO_MMAP

diff --git a/tests/archive.7z b/tests/archive.7z
diff --git a/tests/archive.gz b/tests/archive.gz
diff --git a/tests/archive.tar.zip b/tests/archive.tar.zip
diff --git a/tests/archive.tgz b/tests/archive.tgz
diff --git a/tests/archive2.tgz b/tests/archive2.tgz
diff --git a/tests/archive3.tgz b/tests/archive3.tgz
diff --git a/tests/gen.sh b/tests/gen.sh
@@ -160,6 +160,7 @@ brotli -9 -c archive.tar > archive.tar.br
 bzip3     -c archive.tar > archive.tar.bz3
 zip    -9 -q archive.tar.zip archive.tar
 zip    -9 -q archive.zip $FILES
+7z         a archive.7z $FILES > /dev/null
 
 tar cfz archive2.tgz archive.tar $FILES archive.tgz
 tar cfz archive3.tgz archive.tgz $FILES archive2.tgz
@@ -171,6 +172,7 @@ $UG -z -c Hello archive.tgz     > out/archive.tgz.out
 $UG -z -c Hello archive.tZ      > out/archive.tZ.out
 $UG -z -c Hello archive.tar.zip > out/archive.tar.zip.out
 $UG -z -c Hello archive.zip     > out/archive.zip.out
+$UG -z -c Hello archive.7z      > out/archive.7z.out
 $UG -z -c Hello archive.tbz     > out/archive.tbz.out
 $UG -z -c Hello archive.tlz     > out/archive.tlz.out
 $UG -z -c Hello archive.txz     > out/archive.txz.out
@@ -186,6 +188,7 @@ $UG -z -c -tShell Hello archive.tgz     > out/archive-t.tgz.out
 $UG -z -c -tShell Hello archive.tZ      > out/archive-t.tZ.out
 $UG -z -c -tShell Hello archive.tar.zip > out/archive-t.tar.zip.out
 $UG -z -c -tShell Hello archive.zip     > out/archive-t.zip.out
+$UG -z -c -tShell Hello archive.7z      > out/archive-t.7z.out
 $UG -z -c -tShell Hello archive.tbz     > out/archive-t.tbz.out
 $UG -z -c -tShell Hello archive.tlz     > out/archive-t.tlz.out
 $UG -z -c -tShell Hello archive.txz     > out/archive-t.txz.out

diff --git a/tests/out/archive-t.7z.out b/tests/out/archive-t.7z.out
diff --git a/tests/out/archive.7z.out b/tests/out/archive.7z.out
@@ -0,0 +1,8 @@
+[1;35marchive.7z{empty.txt}[m[1;36m:[m0
+[1;35marchive.7z{Hello.bat}[m[1;36m:[m1
+[1;35marchive.7z{Hello.class}[m[1;36m:[m1
+[1;35marchive.7z{Hello.java}[m[1;36m:[m2
+[1;35marchive.7z{Hello.pdf}[m[1;36m:[m1
+[1;35marchive.7z{Hello.sh}[m[1;36m:[m1
+[1;35marchive.7z{Hello.txt}[m[1;36m:[m1
+[1;35marchive.7z{emptyline.txt}[m[1;36m:[m0
diff --git a/tests/verify.sh b/tests/verify.sh
@@ -384,6 +384,8 @@ printf .
 $UG -z -c Hello archive.tar.zip | $DIFF out/archive.tar.zip.out || ERR "-z -c Hello archive.tar.zip"
 printf .
 $UG -z -c Hello archive.zip     | $DIFF out/archive.zip.out     || ERR "-z -c Hello archive.zip"
+printf .
+$UG -z -c Hello archive.7z      | $DIFF out/archive.7z.out      || ERR "-z -c Hello archive.7z"
 if [ "$have_libbz2" == yes ]; then
 printf .
 $UG -z -c Hello archive.tbz     | $DIFF out/archive.tbz.out     || ERR "-z -c Hello archive.tbz"
@@ -427,6 +429,8 @@ printf .
 $UG -z -c -tShell Hello archive.tar.zip | $DIFF out/archive-t.tar.zip.out || ERR "-z -c -tShell Hello archive.tar.zip"
 printf .
 $UG -z -c -tShell Hello archive.zip     | $DIFF out/archive-t.zip.out     || ERR "-z -c -tShell Hello archive.zip"
+printf .
+$UG -z -c -tShell Hello archive.7z      | $DIFF out/archive-t.7z.out      || ERR "-z -c -tShell Hello archive.7z"
 if [ "$have_libbz2" == yes ]; then
 printf .
 $UG -z -c -tShell Hello archive.tbz     | $DIFF out/archive-t.tbz.out     || ERR "-z -c -tShell Hello archive.tbz"