1 files changed, 42 insertions, 11 deletions

diff --git a/save-xml.c b/save-xml.c
index 37d6d062e..b797475e5 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -67,10 +67,9 @@ static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const c
  * characters, but at least libxml2 doesn't like them. It doesn't even
  * allow them quoted. So we just skip them and replace them with '?'.
  *
- * Nothing else (and if we ever do this using attributes, we'd need to
- * quote the quotes we use too).
+ * If we do this for attributes, we need to quote the quotes we use too.
  */
-static void quote(FILE *f, const char *text)
+static void quote(FILE *f, const char *text, int is_attribute)
 {
 	const char *p = text;
 
@@ -97,6 +96,16 @@ static void quote(FILE *f, const char *text)
 		case '&':
 			escape = "&";
 			break;
+		case '\'':
+			if (!is_attribute)
+				continue;
+			escape = "'";
+			break;
+		case '\"':
+			if (!is_attribute)
+				continue;
+			escape = """;
+			break;
 		}
 		fwrite(text, (p - text - 1), 1, f);
 		if (!escape)
@@ -106,7 +115,7 @@ static void quote(FILE *f, const char *text)
 	}
 }
 
-static void show_utf8(FILE *f, const char *text, const char *pre, const char *post)
+static void show_utf8(FILE *f, const char *text, const char *pre, const char *post, int is_attribute)
 {
 	int len;
 
@@ -121,7 +130,7 @@ static void show_utf8(FILE *f, const char *text, const char *pre, const char *po
 		len--;
 	/* FIXME! Quoting! */
 	fputs(pre, f);
-	quote(f, text);
+	quote(f, text, is_attribute);
 	fputs(post, f);
 }
 
@@ -171,7 +180,7 @@ static void show_location(FILE *f, struct dive *dive)
 		}
 		prefix = buffer;
 	}
-	show_utf8(f, dive->location, prefix,"</location>\n");
+	show_utf8(f, dive->location, prefix,"</location>\n", 0);
 }
 
 static void save_overview(FILE *f, struct dive *dive)
@@ -180,10 +189,10 @@ static void save_overview(FILE *f, struct dive *dive)
 	save_temperatures(f, dive);
 	show_duration(f, dive->surfacetime, "  <surfacetime>", "</surfacetime>\n");
 	show_location(f, dive);
-	show_utf8(f, dive->divemaster, "  <divemaster>","</divemaster>\n");
-	show_utf8(f, dive->buddy, "  <buddy>","</buddy>\n");
-	show_utf8(f, dive->notes, "  <notes>","</notes>\n");
-	show_utf8(f, dive->suit, "  <suit>","</suit>\n");
+	show_utf8(f, dive->divemaster, "  <divemaster>","</divemaster>\n", 0);
+	show_utf8(f, dive->buddy, "  <buddy>","</buddy>\n", 0);
+	show_utf8(f, dive->notes, "  <notes>","</notes>\n", 0);
+	show_utf8(f, dive->suit, "  <suit>","</suit>\n", 0);
 }
 
 static void save_cylinder_info(FILE *f, struct dive *dive)
@@ -262,7 +271,7 @@ static void save_one_event(FILE *f, struct event *ev)
 	show_index(f, ev->type, "type='", "'");
 	show_index(f, ev->flags, "flags='", "'");
 	show_index(f, ev->value, "value='", "'");
-	show_utf8(f, ev->name, " name='", "'");
+	show_utf8(f, ev->name, " name='", "'", 1);
 	fprintf(f, " />\n");
 }
 
@@ -275,6 +284,18 @@ static void save_events(FILE *f, struct event *ev)
 	}
 }
 
+static void save_trip(FILE *f, struct dive *trip)
+{
+	struct tm *tm = gmtime(&trip->when);
+
+	fprintf(f, "<trip");
+	fprintf(f, " date='%04u-%02u-%02u'",
+		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+	if (trip->location)
+		show_utf8(f, trip->location, " location=\'","\'", 1);
+	fprintf(f, " />\n");
+}
+
 static void save_dive(FILE *f, struct dive *dive)
 {
 	int i;
@@ -283,6 +304,8 @@ static void save_dive(FILE *f, struct dive *dive)
 	fputs("<dive", f);
 	if (dive->number)
 		fprintf(f, " number='%d'", dive->number);
+	if (dive->tripflag != TF_NONE)
+		fprintf(f, " tripflag='%s'", tripflag_names[dive->tripflag]);
 	if (dive->rating)
 		fprintf(f, " rating='%d'", dive->rating);
 	fprintf(f, " date='%04u-%02u-%02u'",
@@ -305,6 +328,8 @@ static void save_dive(FILE *f, struct dive *dive)
 void save_dives(const char *filename)
 {
 	int i;
+	GList *trip = NULL;
+
 	FILE *f = fopen(filename, "w");
 
 	if (!f)
@@ -314,6 +339,12 @@ void save_dives(const char *filename)
 	update_dive(current_dive);
 
 	fprintf(f, "<dives>\n<program name='subsurface' version='%d'></program>\n", VERSION);
+
+	/* save the trips */
+	while ((trip = NEXT_TRIP(trip, dive_trip_list)) != 0)
+		save_trip(f, trip->data);
+
+	/* save the dives */
 	for (i = 0; i < dive_table.nr; i++)
 		save_dive(f, get_dive(i));
 	fprintf(f, "</dives>\n");