quote backslashes in regex patterns

Author: kalmera

src/g2html/Config.java

@@ -7,6 +7,7 @@
 import java.net.URLEncoder;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.regex.Pattern;
 
 public class Config {
 	// default subdirectory names in the result
@@ -71,7 +72,7 @@ public static void load(String[] args) {
 
 	// returns the input dot file for a given C file, and function
 	public static File getFunDotFile(String path, String fun) {
-		path = path.replaceAll(File.separator,"%2F");
+		path = path.replaceAll(Pattern.quote(File.separator),"%2F");
 		File f = new File(new File(new File(conf.getCfgDir()), path), fun + ".dot");
 		return f;
 	}

src/g2html/Loc.java

@@ -4,6 +4,7 @@
 import java.io.*;
 import java.net.URLEncoder;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 public class Loc {
 
@@ -17,7 +18,7 @@ static public void parseLocNode(XMLStreamReader parser, Result res, ResultStats
 		String id   = parser.getAttributeValue("", "id");
 
 		// compute the file-id from the full path
-		String shortFile = file.replaceAll(File.separator,"%2F");
+		String shortFile = file.replaceAll(Pattern.quote(File.separator),"%2F");
 
 		// look up the database for the file
 		FileStats fileStats = resultStats.getStats(shortFile);

src/g2html/Result.java

@@ -2,6 +2,7 @@
 
 import java.io.*;
 import java.nio.channels.FileChannel;
+import java.util.regex.Pattern;
 
 // handles the result directory structure
 public class Result {
@@ -103,7 +104,7 @@ public Result(String resDir) throws IOException {
 
 	// return a listing file to be created
 	public File getListingFile(String path) {
-		path = path.replaceAll(File.separator,"%2F");
+		path = path.replaceAll(Pattern.quote(File.separator),"%2F");
 		File f = new File(filDir, path+".xml");
 		return f;
 	}

src/g2html/ResultStats.java

@@ -11,6 +11,8 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 // result stats encapsulates all databases for all files
 public class ResultStats {
@@ -57,7 +59,7 @@ public void printReport(Result r)
 				continue;
 			// write the file-name
 			report.writeStartElement("file");
-			report.writeAttribute("name", file.replaceAll("%2F",File.separator));
+			report.writeAttribute("name", file.replaceAll("%2F", Matcher.quoteReplacement(File.separator)));
 
 			// for each function
 			for (String fun : fm.get(file).getFunctions()){

src/g2html/Structure.java

@@ -6,14 +6,15 @@
 import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.regex.Pattern;
 
 public class Structure {
 	// read the structure from the xml and store it in the databases
 	public static void parseFileNode(XMLStreamReader parser, ResultStats resultStats)
 					throws XMLStreamException {
 
 		// get basic information
-		String name = parser.getAttributeValue("", "path").replaceAll(File.separator,"%2F");;
+		String name = parser.getAttributeValue("", "path").replaceAll(Pattern.quote(File.separator),"%2F");;
 		String fun = "";
 
 		// parse the file and

src/g2html/Warning.java

@@ -5,6 +5,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 public class Warning {
 	private static int counter = 1;
@@ -43,7 +44,7 @@ static public void parseWarningNode(XMLStreamReader parser, Result res, ResultSt
 							readcc.getLocalName()=="text"){
 				String path = readcc.getAttributeValue("","file");
 				String line = readcc.getAttributeValue("","line");
-				String shortFile = path.replaceAll(File.separator,"%2F");;
+				String shortFile = path.replaceAll(Pattern.quote(File.separator),"%2F");;
 
 				resultStats.getStats(shortFile).addWarning(id,Integer.valueOf(line));
 			}