diff options
| author | Iaccidentally <coryhuckaby@gmail.com> | 2012-10-01 07:16:22 -0700 |
|---|---|---|
| committer | Iaccidentally <coryhuckaby@gmail.com> | 2012-10-01 07:16:22 -0700 |
| commit | e44d0754b55aac9b07af289eee18ecd4d0022a01 (patch) | |
| tree | 72ec004d5b266a68e2733bf130410ba343f087b7 | |
| parent | 99bad86db6770b88eb98baa0b36fc3002be3a9f4 (diff) | |
| parent | f4b45f5ca06d877ce7a0ae7bc02f28f2da786354 (diff) | |
| download | Essentials-e44d0754b55aac9b07af289eee18ecd4d0022a01.tar Essentials-e44d0754b55aac9b07af289eee18ecd4d0022a01.tar.gz Essentials-e44d0754b55aac9b07af289eee18ecd4d0022a01.tar.lz Essentials-e44d0754b55aac9b07af289eee18ecd4d0022a01.tar.xz Essentials-e44d0754b55aac9b07af289eee18ecd4d0022a01.zip | |
Merge pull request #164 from chrisgward/patch-1
Fixing bad file names in Windows (Fixes #2924)
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Util.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java index c1f7cd014..72c1accef 100644 --- a/Essentials/src/com/earth2me/essentials/Util.java +++ b/Essentials/src/com/earth2me/essentials/Util.java @@ -26,7 +26,9 @@ public class Util public static String sanitizeFileName(final String name) { - final String newName = INVALIDFILECHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_"); + String newName = INVALIDFILECHARS.matcher(name.toLowerCase(Locale.ENGLISH)).replaceAll("_"); + if(Pattern.compile("^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\\.(.+))?$", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE | Pattern.COMMENTS).matcher(newName).matches()) + newName = "_" + newName; return newName; } |