From f4b45f5ca06d877ce7a0ae7bc02f28f2da786354 Mon Sep 17 00:00:00 2001
From: Chris Ward <chris@chrisgward.com>
Date: Mon, 1 Oct 2012 21:20:17 +1000
Subject: Fixing bad file names in Windows (Fixes #2924)

---
 Essentials/src/com/earth2me/essentials/Util.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
 	}
 
-- 
cgit v1.2.3