From 266bb7811ca13ac04030be5b6bc01e70b9c7cb78 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Sat, 20 Jan 2018 07:47:33 +0000
Subject: [PATCH] When exporting JSON to a message base, expand sole LF to CRLF
(JSON.stringify creates \n-terminated lines).
---
exec/avatars.js | 4 ++--
exec/sbbslist.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/exec/avatars.js b/exec/avatars.js
index 4b58cb8eef..0e746a97d4 100644
--- a/exec/avatars.js
+++ b/exec/avatars.js
@@ -381,7 +381,7 @@ function export_users(msgbase, realnames, all)
for(var i in list)
list[i].sort();
var body = "json-begin\r\n";
- body += JSON.stringify(list, null, 1) + "\r\n";
+ body += lfexpand(JSON.stringify(list, null, 1)) + "\r\n";
body += "json-end\r\n";
body += "--- " + js.exec_file + " " + REVISION + "\r\n";
var result = msgbase.save_msg({ to:user_avatars, from:system.operator, subject:system.name }, body);
@@ -402,7 +402,7 @@ function export_file_to_msgbase(msgbase, filename)
data = LZString.compressToBase64(data);
var body = "";
body += "sauce-json-begin\r\n";
- body += JSON.stringify(SAUCE.read(file.name), null, 1) + "\r\n";
+ body += lfexpand(JSON.stringify(SAUCE.read(file.name), null, 1)) + "\r\n";
body += "sauce-json-end\r\n";
body += "bin-lz-begin\r\n";
body += data.match(/([\x00-\xff]{1,72})/g).join("\r\n");
diff --git a/exec/sbbslist.js b/exec/sbbslist.js
index ebfb6c704e..c5c36eaf8a 100644
--- a/exec/sbbslist.js
+++ b/exec/sbbslist.js
@@ -133,7 +133,7 @@ function export_entry(bbs, msgbase)
delete bbs.entry;
body += "\r\njson-begin\r\n";
- body += JSON.stringify(bbs, null, 1) + "\r\n";
+ body += lfexpand(JSON.stringify(bbs, null, 1)) + "\r\n";
body += "json-end\r\n";
body += "--- " + js.exec_file + " " + REVISION + "\r\n";
// print(body);
--
GitLab