Skip to content

Commit 703228a

Browse files
committed
Merge branch 'pr/19'
IO-483: getPrefixLength return -1 if unix file contains colon This closes #19 Thanks to @marko-vasic
2 parents fcc6361 + a7bd568 commit 703228a

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

src/main/java/org/apache/commons/io/FilenameUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,8 @@ public static int getPrefixLength(final String filename) {
666666
return 2;
667667
}
668668
return 3;
669+
} else if (ch0 == UNIX_SEPARATOR) {
670+
return 1;
669671
}
670672
return NOT_FOUND;
671673

src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,10 @@ public void testGetPrefixLength() {
570570
assertEquals(9, FilenameUtils.getPrefixLength("//server/a/b/c.txt"));
571571
assertEquals(-1, FilenameUtils.getPrefixLength("\\\\\\a\\b\\c.txt"));
572572
assertEquals(-1, FilenameUtils.getPrefixLength("///a/b/c.txt"));
573+
574+
assertEquals(1, FilenameUtils.getPrefixLength("/:foo"));
575+
assertEquals(1, FilenameUtils.getPrefixLength("/:/"));
576+
assertEquals(1, FilenameUtils.getPrefixLength("/:::::::.txt"));
573577
}
574578

575579
@Test

0 commit comments

Comments
 (0)