try to only print relative paths if no full paths printed (to keep output consistent)

Author: juliusmusseau

src/main/java/com/mergebase/log4j/Log4JDetector.java

@@ -90,6 +90,7 @@ public class Log4JDetector {
 
     private static File currentDir = null;
     private static String currentPath = null;
+    private static boolean printFullPaths = false;
 
     public static void main(String[] args) throws IOException {
         currentDir = canonicalize(new File("."));
@@ -525,12 +526,14 @@ public void close() {
                                             buf.append("== 2.12.4 _SAFE_");
                                         } else {
                                             buf.append("== 2.12.3 _OKAY_");
+                                            foundHits = true;
                                         }
                                     } else if (isLog4j2_17) {
                                         if (hasJdbcJndiDisabled) {
                                             buf.append(">= 2.17.1 _SAFE_");
                                         } else {
                                             buf.append("== 2.17.0 _OKAY_");
+                                            foundHits = true;
                                         }
                                     } else if (isLog4j2_16) {
                                         buf.append("== 2.16.0 _OKAY_");
@@ -550,6 +553,7 @@ public void close() {
                                     buf.append("== 2.3.2 _SAFE_");
                                 } else {
                                     buf.append("== 2.3.1 _OKAY_");
+                                    foundHits = true;
                                 }
                             } else {
                                 buf.append(">= 2.0-beta9 (< 2.10.0) _VULNERABLE_");
@@ -576,10 +580,14 @@ public void close() {
     }
 
     private static String prepareOutput(String zipPath, StringBuilder buf) {
-        if (zipPath.startsWith(currentPath)) {
-            zipPath = zipPath.substring(currentPath.length());
-            if (zipPath.startsWith(File.separator)) {
-                zipPath = zipPath.substring(1);
+        if (!printFullPaths) {
+            if (zipPath.startsWith(currentPath)) {
+                zipPath = zipPath.substring(currentPath.length());
+                if (zipPath.startsWith(File.separator)) {
+                    zipPath = zipPath.substring(1);
+                }
+            } else {
+                printFullPaths = true;
             }
         }
         if (json) {
@@ -866,12 +874,14 @@ private static void analyze(File f) {
                                             buf.append("== 2.12.4 _SAFE_");
                                         } else {
                                             buf.append("== 2.12.3 _OKAY_");
+                                            foundHits = true;
                                         }
                                     } else {
                                         if (hasJdbcJndiDisabled) {
                                             buf.append(">= 2.17.1 _SAFE_");
                                         } else {
                                             buf.append("== 2.17.0 _OKAY_");
+                                            foundHits = true;
                                         }
                                     }
                                 } else if (isLog4J_2_15) {
@@ -895,6 +905,7 @@ private static void analyze(File f) {
                                         buf.append("== 2.3.2 _SAFE_");
                                     } else {
                                         buf.append("== 2.3.1 _OKAY_");
+                                        foundHits = true;
                                     }
                                 } else {
                                     buf.append(">= 2.0-beta9 (< 2.10.0) _VULNERABLE_");