File.separator vs File.pathSeparator

Author: kalmera

src/g2html/Config.java

@@ -71,7 +71,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.pathSeparator,"%2F");
+		path = path.replaceAll(File.separator,"%2F");
 		File f = new File(new File(new File(conf.getCfgDir()), path), fun + ".dot");
 		return f;
 	}

src/g2html/Loc.java

@@ -17,13 +17,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 = null;
-		try {
-			shortFile = URLEncoder.encode(file, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-			System.exit(255);
-		}
+		String shortFile = file.replaceAll(File.separator,"%2F");
 
 		// look up the database for the file
 		FileStats fileStats = resultStats.getStats(shortFile);

src/g2html/Result.java

@@ -64,7 +64,9 @@ private static void copyFromJar(String f,File t) throws IOException{
 	        }
 	    } finally {
 	        stream.close();
-	        resStreamOut.close();
+			    if (resStreamOut != null) {
+				    resStreamOut.close();
+			    }
 	    }
 	}
 
@@ -100,8 +102,9 @@ public Result(String resDir) throws IOException {
 	}
 
 	// return a listing file to be created
-	public File getListingFile(String file) {
-		File f = new File(filDir, file+".xml");
+	public File getListingFile(String path) {
+		path = path.replaceAll(File.separator,"%2F");
+		File f = new File(filDir, path+".xml");
 		return f;
 	}
 

src/g2html/ResultStats.java

@@ -57,7 +57,7 @@ public void printReport(Result r)
 				continue;
 			// write the file-name
 			report.writeStartElement("file");
-			report.writeAttribute("name", URLDecoder.decode(file,"UTF-8"));
+			report.writeAttribute("name", file.replaceAll("%2F",File.separator));
 
 			// for each function
 			for (String fun : fm.get(file).getFunctions()){

src/g2html/Structure.java

@@ -3,6 +3,7 @@
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
+import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
@@ -12,13 +13,7 @@ public static void parseFileNode(XMLStreamReader parser, ResultStats resultStats
 					throws XMLStreamException {
 
 		// get basic information
-		String name = null;
-		try {
-			name = URLEncoder.encode(parser.getAttributeValue("", "path"), "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-			System.exit(255);
-		}
+		String name = parser.getAttributeValue("", "path").replaceAll(File.separator,"%2F");;
 		String fun = "";
 
 		// parse the file and

src/g2html/Warning.java

@@ -41,9 +41,9 @@ static public void parseWarningNode(XMLStreamReader parser, Result res, ResultSt
 			// for each text element, store the id of the warning with the text location
 			if (readcc.getEventType()== XMLStreamConstants.START_ELEMENT &&
 							readcc.getLocalName()=="text"){
-				String file = readcc.getAttributeValue("","file");
+				String path = readcc.getAttributeValue("","file");
 				String line = readcc.getAttributeValue("","line");
-				String shortFile = new File(file).getName();
+				String shortFile = path.replaceAll(File.separator,"%2F");;
 
 				resultStats.getStats(shortFile).addWarning(id,Integer.valueOf(line));
 			}