I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Config files: Add some encoding help

Browse Source 
* DataHelper, Router:
      - Save config files in UTF-8 rather than the default encoding,
        since we read them in UTF-8
    * jetty.xml: Change encoding to UTF-8
    * logs.jsp: Add system encoding
    * NTCP: Clean up clock skew shitlist message
    * Shitlist: Clean up expire message
    * WorkingDir: Ensure modified files are processed with UTF-8 encoding
This commit is contained in:
zzz
2009-08-17 22:14:39 +00:00
parent 66831c619b
commit be9523f1e4
11 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/src/net/i2p/data/DataHelper.java
View File

@ -17,11 +17,12 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
@ -217,6 +218,9 @@ public class DataHelper {
* - '#' or ';' starts a comment line, but '!' does not
* - Leading whitespace is not trimmed
* - '=' is the only key-termination character (not ':' or whitespace)
*
* Note that the escaping of \r or \n was probably a mistake and should be taken out.
*
*/
public static void loadProps(Properties props, File file) throws IOException {
loadProps(props, file, false);
@ -257,10 +261,14 @@ public class DataHelper {
}
}
/**
* Note that this does not escape the \r or \n that are unescaped in loadProps() above.
*/
public static void storeProps(Properties props, File file) throws IOException {
PrintWriter out = null;
try {
out = new PrintWriter(new BufferedWriter(new FileWriter(file)));
out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), "UTF-8")));
out.println("# NOTE: This I2P config file must use UTF-8 encoding");
for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
String name = (String)iter.next();
String val = props.getProperty(name);