From 77c9a644acfa86dbeee5d8054efc388566ca534e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 6 May 2015 01:48:47 +0000
Subject: [PATCH] Naming services: Export address books with Windows line
endings on Windows (ticket #1557)
---
.../src/net/i2p/client/naming/NamingService.java | 13 ++++++++-----
.../i2p/client/naming/SingleFileNamingService.java | 7 ++++---
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index 0a38f81862..5a38c9e7fa 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -295,23 +295,26 @@ public abstract class NamingService {
if (list != null)
out.write(" (" + list + ')');
}
- out.write('\n');
+ final String nl = System.getProperty("line.separator", "\n");
+ out.write(nl);
int sz = entries.size();
if (sz <= 0) {
- out.write("# No entries\n");
+ out.write("# No entries");
+ out.write(nl);
return;
}
out.write("# Exported: ");
out.write((new Date()).toString());
- out.write('\n');
+ out.write(nl);
if (sz > 1) {
- out.write("# " + sz + " entries\n");
+ out.write("# " + sz + " entries");
+ out.write(nl);
}
for (Map.Entry<String, String> e : entries.entrySet()) {
out.write(e.getKey());
out.write('=');
out.write(e.getValue());
- out.write('\n');
+ out.write(nl);
}
}
diff --git a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
index f4e9225167..6414f64b45 100644
--- a/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
+++ b/core/java/src/net/i2p/client/naming/SingleFileNamingService.java
@@ -443,10 +443,11 @@ public class SingleFileNamingService extends NamingService {
public void export(Writer out, Properties options) throws IOException {
out.write("# Address book: ");
out.write(getName());
- out.write('\n');
+ final String nl = System.getProperty("line.separator", "\n");
+ out.write(nl);
out.write("# Exported: ");
out.write((new Date()).toString());
- out.write('\n');
+ out.write(nl);
BufferedReader in = null;
getReadLock();
try {
@@ -454,7 +455,7 @@ public class SingleFileNamingService extends NamingService {
String line = null;
while ( (line = in.readLine()) != null) {
out.write(line);
- out.write('\n');
+ out.write(nl);
}
} finally {
if (in != null) try { in.close(); } catch (IOException ioe) {}
--
GitLab