Escape all strings stored in files

3 files changed, 92 insertions, 82 deletions

diff --git a/src/loadsave.c b/src/loadsave.c
index 654b4e4..477cd2d 100644
--- a/src/loadsave.c
+++ b/src/loadsave.c
@@ -377,6 +377,80 @@ static void free_ds_tree(struct ds_node *root)
 }
 
 
+char *escape_text(const char *a)
+{
+	char *b;
+	size_t l1, l, i;
+
+	l1 = strlen(a);
+
+	b = malloc(2*l1 + 1);
+	l = 0;
+
+	for ( i=0; i<l1; i++ ) {
+
+		char c = a[i];
+
+		/* Yes, this is horribly confusing */
+		if ( c == '\n' ) {
+			b[l++] = '\\';  b[l++] = 'n';
+		} else if ( c == '\r' ) {
+			b[l++] = '\\';  b[l++] = 'r';
+		} else if ( c == '\"' ) {
+			b[l++] = '\\';  b[l++] = '\"';
+		} else if ( c == '\t' ) {
+			b[l++] = '\\';  b[l++] = 't';
+		} else {
+			b[l++] = c;
+		}
+
+	}
+	b[l++] = '\0';
+
+	return realloc(b, l);
+}
+
+
+char *unescape_text(const char *a)
+{
+	char *b;
+	size_t l1, l, i;
+	int escape;
+
+	l1 = strlen(a);
+
+	b = malloc(l1 + 1);
+	l = 0;
+	escape = 0;
+
+	for ( i=0; i<l1; i++ ) {
+
+		char c = a[i];
+
+		if ( escape ) {
+			if ( c == 'r' ) b[l++] = '\r';
+			if ( c == 'n' ) b[l++] = '\n';
+			if ( c == '\"' ) b[l++] = '\"';
+			if ( c == 't' ) b[l++] = '\t';
+			escape = 0;
+			continue;
+		}
+
+		if ( c == '\\' ) {
+			escape = 1;
+			continue;
+		}
+
+		b[l++] = c;
+
+	}
+	b[l++] = '\0';
+
+	return realloc(b, l);
+}
+
+
+
 int get_field_f(struct ds_node *root, const char *key, double *val)
 {
 	struct ds_node *node;
@@ -473,7 +547,8 @@ int get_field_s(struct ds_node *root, const char *key, char **val)
 	strncpy(v, node->value+s1+1, s2-s1-1);
 	v[s2-s1-1] = '\0';
 
-	*val = v;
+	*val = unescape_text(v);
+	free(v);
 
 	return 0;
 }
@@ -792,8 +867,18 @@ static void check_prefix_output(struct serializer *ser)
 
 void serialize_s(struct serializer *ser, const char *key, const char *val)
 {
+	char *n;
+
+	n = escape_text(val);
+	if ( n == NULL ) {
+		fprintf(stderr, "Failed to escape '%s'\n", val);
+		return;
+	}
+
 	check_prefix_output(ser);
-	fprintf(ser->fh, "%s = \"%s\"\n", key, val);
+	fprintf(ser->fh, "%s = \"%s\"\n", key, n);
+
+	free(n);
 }
 
 
diff --git a/src/loadsave.h b/src/loadsave.h
index 09226d3..14fb6ff 100644
--- a/src/loadsave.h
+++ b/src/loadsave.h
@@ -53,6 +53,9 @@ struct serializer
 
 extern void show_tree(struct ds_node *root, const char *path);
 
+extern char *escape_text(const char *a);
+extern char *unescape_text(const char *a);
+
 extern void serialize_start(struct serializer *s, const char *id);
 extern void serialize_s(struct serializer *s, const char *key, const char *val);
 extern void serialize_f(struct serializer *s, const char *key, double val);
diff --git a/src/notes.c b/src/notes.c
index 71a6b1a..270f753 100644
--- a/src/notes.c
+++ b/src/notes.c
@@ -97,86 +97,9 @@ static gint close_notes_sig(GtkWidget *w, struct presentation *p)
 }
 
 
-static char *escape_text(const char *a)
-{
-	char *b;
-	size_t l1, l, i;
-
-	l1 = strlen(a);
-
-	b = malloc(2*l1 + 1);
-	l = 0;
-
-	for ( i=0; i<l1; i++ ) {
-
-		char c = a[i];
-
-		/* Yes, this is horribly confusing */
-		if ( c == '\n' ) {
-			b[l++] = '\\';  b[l++] = 'n';
-		} else if ( c == '\r' ) {
-			b[l++] = '\\';  b[l++] = 'r';
-		} else if ( c == '\"' ) {
-			b[l++] = '\\';  b[l++] = '\"';
-		} else if ( c == '\t' ) {
-			b[l++] = '\\';  b[l++] = 't';
-		} else {
-			b[l++] = c;
-		}
-
-	}
-	b[l++] = '\0';
-
-	return realloc(b, l);
-}
-
-
-static char *unescape_text(const char *a)
-{
-	char *b;
-	size_t l1, l, i;
-	int escape;
-
-	l1 = strlen(a);
-
-	b = malloc(l1 + 1);
-	l = 0;
-	escape = 0;
-
-	for ( i=0; i<l1; i++ ) {
-
-		char c = a[i];
-
-		if ( escape ) {
-			if ( c == 'r' ) b[l++] = '\r';
-			if ( c == 'n' ) b[l++] = '\n';
-			if ( c == '\"' ) b[l++] = '\"';
-			if ( c == 't' ) b[l++] = '\t';
-			escape = 0;
-			continue;
-		}
-
-		if ( c == '\\' ) {
-			escape = 1;
-			continue;
-		}
-
-		b[l++] = c;
-
-	}
-	b[l++] = '\0';
-
-	return realloc(b, l);
-}
-
-
 void write_notes(struct slide *s, struct serializer *ser)
 {
-	char *es;
-
-	es = escape_text(s->notes);
-	serialize_s(ser, "notes", es);
-	free(es);
+	serialize_s(ser, "notes", s->notes);
 }
 
 
@@ -186,8 +109,7 @@ void load_notes(struct ds_node *node, struct slide *s)
 
 	if ( get_field_s(node, "notes", &v) ) return;
 
-	s->notes = unescape_text(v);
-	free(v);
+	s->notes = v;
 }