@@ -15,12 +15,14 @@ pub const Store = struct {
1515 }
1616
1717 fn load(self: *Store) void {
18- const text = filesystem.readFileAlloc(self.a, self.path, 1 << 20) catch return;
19- var it = std.mem.splitScalar(u8, text, '\n');
18+ const raw = filesystem.readFileAlloc(self.a, self.path, 1 << 20) catch return;
19+ var it = std.mem.splitScalar(u8, raw, '\n');
2020 while (it.next()) |line| {
2121 const trimmed = std.mem.trim(u8, line, "\r");
2222 if (trimmed.len == 0) continue;
23- self.entries.append(self.a, self.a.dupe(u8, trimmed) catch return) catch return;
23+ const decoded = self.unescape(trimmed) catch continue;
24+ if (decoded.len == 0) continue;
25+ self.entries.append(self.a, self.a.dupe(u8, decoded) catch return) catch return;
2426 }
2527 }
2628
@@ -38,11 +40,37 @@ pub const Store = struct {
3840 self.flush();
3941 }
4042
43+ /// Escape backslash and newline so each entry stays one line in the file.
44+ fn escape(self: *Store, e: []const u8) []const u8 {
45+ var out: std.ArrayList(u8) = .empty;
46+ for (e) |c| {
47+ if (c == '\\' or c == '\n') out.append(self.a, '\\') catch return e;
48+ out.append(self.a, if (c == '\n') 'n' else c) catch return e;
49+ }
50+ return out.items;
51+ }
52+
53+ fn unescape(self: *Store, s: []const u8) ![]const u8 {
54+ if (std.mem.indexOfScalar(u8, s, '\\') == null) return s;
55+ var out: std.ArrayList(u8) = .empty;
56+ var i: usize = 0;
57+ while (i < s.len) {
58+ if (s[i] == '\\' and i + 1 < s.len) {
59+ i += 1;
60+ out.append(self.a, if (s[i] == 'n') '\n' else s[i]) catch return s;
61+ } else {
62+ out.append(self.a, s[i]) catch return s;
63+ }
64+ i += 1;
65+ }
66+ return out.items;
67+ }
68+
4169 fn flush(self: *Store) void {
4270 const start = if (self.entries.items.len > self.max) self.entries.items.len - self.max else 0;
4371 var out: std.ArrayList(u8) = .empty;
4472 for (self.entries.items[start..]) |e| {
45- out.appendSlice(self.a, e) catch return;
73+ out.appendSlice(self.a, self.escape(e)) catch return;
4674 out.append(self.a, '\n') catch return;
4775 }
4876 filesystem.writeFile(self.path, out.items) catch {};