Normalize file separators before warning about equal archive entries

Fixes #248.
codehaus-plexus · Dec 31, 2022 · 9b6b399 · 9b6b399
1 parent b5e8974
commit 9b6b399
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
@@ -426,7 +426,7 @@ protected boolean shouldExtractEntry( File targetDirectory, File targetFileName,
                 "" )
                 + suffix;
         boolean fileOnDiskIsOlderThanEntry = targetFileName.lastModified() < entryDate.getTime();
-        boolean differentCasing = !entryName.equals( relativeCanonicalDestPath );
+        boolean differentCasing = !normalizedFileSeparator( entryName ).equals( normalizedFileSeparator( relativeCanonicalDestPath ) );
 
         // Warn for case (4) and (5) if the file system is case-insensitive
         if ( differentCasing )
@@ -440,5 +440,8 @@ protected boolean shouldExtractEntry( File targetDirectory, File targetFileName,
         // Override the existing file if isOverwrite() is true or if the file on disk is older than the one in the archive
         return isOverwrite() || fileOnDiskIsOlderThanEntry;
     }
-
+
+    private String normalizedFileSeparator(String pathOrEntry) {
+    	return pathOrEntry.replace("/", File.separator);
+    }
 }