deflookup: look by line content without spaces if available

Related: csutils#98

src/lib/deflookup.cc

@@ -19,6 +19,7 @@
 
 #include "deflookup.hh"
 
+#include "finger-print.hh"
 #include "msg-filter.hh"
 #include "parser.hh"
 
@@ -79,8 +80,29 @@ void DefLookup::hashDefect(const Defect &def)
     defList.push_back(def);
 }
 
-static bool defLookupCore(TDefList &defList)
+static bool defLookupCore(TDefList &defList, const Defect &lookFor)
 {
+    // look by line content without spaces if available
+    const std::string lineCont = FingerPrinter(lookFor).getLineContent();
+    if (!lineCont.empty()) {
+        bool fullLineContCoverage = true;
+
+        for (auto it = defList.begin(); it != defList.end(); ++it) {
+            const std::string lineContNow = FingerPrinter(*it).getLineContent();
+            if (lineContNow.empty())
+                fullLineContCoverage = false;
+            else if (lineCont == lineContNow) {
+                // matched by line content without spaces
+                defList.erase(it);
+                return true;
+            }
+        }
+
+        if (fullLineContCoverage)
+            // we had line content for all lines but none of them matched
+            return false;
+    }
+
     // just remove an arbitrary one
     // TODO: add some other criteria in order to make the match more precise
     defList.resize(defList.size() - 1U);
@@ -132,7 +154,7 @@ bool DefLookup::lookup(const Defect &def)
     // process the resulting list of defects sequentially
     TDefList &defList = itByMsg->second;
     assert(!defList.empty());
-    if (!defLookupCore(defList))
+    if (!defLookupCore(defList, def))
         return false;
 
     // remove empty maps to speed up subsequent lookups

src/lib/finger-print.cc

@@ -132,3 +132,8 @@ std::string FingerPrinter::getHash(const EFingerPrintVer fpv) const
     // return SHA1 hash from basicData AND lineContent
     return computeHexSHA1(d->basicData + sep + d->lineContent);
 }
+
+std::string FingerPrinter::getLineContent() const
+{
+    return d->lineContent;
+}

src/lib/finger-print.hh

@@ -38,6 +38,9 @@ class FingerPrinter {
         /// return fingerprint of the selected kind
         std::string getHash(EFingerPrintVer) const;
 
+        /// return line content without spaces (empty string if not available)
+        std::string getLineContent() const;
+
     private:
         struct Private;
         std::unique_ptr<Private> d;

tests/csdiff/CMakeLists.txt

@@ -84,6 +84,7 @@ test_csdiff(diff-misc 16-cov-parser-key-event)
 test_csdiff(diff-misc 17-cov-parser-key-event)
 test_csdiff(diff-misc 18-cov-parser-key-event)
 test_csdiff(diff-misc 19-cov-parser-key-event)
+test_csdiff(diff-misc 20-shellcheck-line-content)
 test_csdiff(diff-misc 21-kernel-shell-code)
 test_csdiff(diff-misc 22-kernel-zstream-path)
 test_csdiff(diff-misc 23-cov-parser-key-event)

tests/csdiff/diff-misc/20-shellcheck-line-content-add-z.err

@@ -0,0 +1,7 @@
+Error: SHELLCHECK_WARNING (CWE-475):
+/usr/lib/dracut/modules.d/01fips/fips.sh:81:5: warning[SC2039]: In POSIX sh, 'local' is undefined.
+#   79|   fips_load_crypto() {
+#   80|       local _k
+#   81|->     local _v
+#   82|       local _module
+#   83|       local _found

tests/csdiff/diff-misc/20-shellcheck-line-content-add.err

@@ -0,0 +1,7 @@
+Error: SHELLCHECK_WARNING (CWE-475):
+/usr/lib/dracut/modules.d/01fips/fips.sh:81:5: warning[SC2039]: In POSIX sh, 'local' is undefined.
+#   79|   fips_load_crypto() {
+#   80|       local _k
+#   81|->     local _v
+#   82|       local _module
+#   83|       local _found