diff options
| -rw-r--r-- | dives/test29.xml | 62 | ||||
| -rw-r--r-- | parse-xml.c | 22 |
2 files changed, 72 insertions, 12 deletions
diff --git a/dives/test29.xml b/dives/test29.xml new file mode 100644 index 000000000..9fb40a61d --- /dev/null +++ b/dives/test29.xml @@ -0,0 +1,62 @@ +<divelog program='subsurface' version='2'> +<settings> +</settings> +<dives> +<dive number='29' tags='boat, wreck' date='2011-12-13' time='06:35:00' duration='30:00 min'> + <location>irrelevant dive location</location> + <notes>This is a dive that has two tags, boat and wreck</notes> + <divecomputer model='Model Product' deviceid='e04d0248' diveid='00000002'> + <depth max='20.1 m' mean='18.293 m' /> + <temperature water='20.0 C' /> + <sample time='0:06 min' depth='1.86 m' temp='20.0 C' ndl='99:00 min' /> + <sample time='1:00 min' depth='20.1 m' /> + <sample time='27:00 min' depth='20.1 m' /> + <sample time='28:00 min' depth='3.0 m' /> + <sample time='29:00 min' depth='3.0 m' /> + <sample time='30:00 min' depth='0.3 m' /> + </divecomputer> +</dive> +<dive number='30' tags='' date='2011-12-13' time='07:35:00' duration='30:00 min'> + <location>irrelevant dive location</location> + <notes>This is a dive that has an empty tags property in the XML file</notes> + <divecomputer model='Model Product' deviceid='e04d0248' diveid='00000002'> + <depth max='20.1 m' mean='18.293 m' /> + <temperature water='20.0 C' /> + <sample time='0:06 min' depth='1.86 m' temp='20.0 C' ndl='99:00 min' /> + <sample time='1:00 min' depth='20.1 m' /> + <sample time='27:00 min' depth='20.1 m' /> + <sample time='28:00 min' depth='3.0 m' /> + <sample time='29:00 min' depth='3.0 m' /> + <sample time='30:00 min' depth='0.3 m' /> + </divecomputer> +</dive> +<dive number='31' tags=',' date='2011-12-13' time='08:35:00' duration='30:00 min'> + <location>irrelevant dive location</location> + <notes>This is a dive that has a tags property with just a comma in the XML file</notes> + <divecomputer model='Model Product' deviceid='e04d0248' diveid='00000002'> + <depth max='20.1 m' mean='18.293 m' /> + <temperature water='20.0 C' /> + <sample time='0:06 min' depth='1.86 m' temp='20.0 C' ndl='99:00 min' /> + <sample time='1:00 min' depth='20.1 m' /> + <sample time='27:00 min' depth='20.1 m' /> + <sample time='28:00 min' depth='3.0 m' /> + <sample time='29:00 min' depth='3.0 m' /> + <sample time='30:00 min' depth='0.3 m' /> + </divecomputer> +</dive> +<dive number='32' tags='a, boat' date='2011-12-13' time='09:35:00' duration='30:00 min'> + <location>irrelevant dive location</location> + <notes>This is a dive that has a single letter tag 'a' (plus the boat tag)</notes> + <divecomputer model='Model Product' deviceid='e04d0248' diveid='00000002'> + <depth max='20.1 m' mean='18.293 m' /> + <temperature water='20.0 C' /> + <sample time='0:06 min' depth='1.86 m' temp='20.0 C' ndl='99:00 min' /> + <sample time='1:00 min' depth='20.1 m' /> + <sample time='27:00 min' depth='20.1 m' /> + <sample time='28:00 min' depth='3.0 m' /> + <sample time='29:00 min' depth='3.0 m' /> + <sample time='30:00 min' depth='0.3 m' /> + </divecomputer> +</dive> +</dives> +</divelog> diff --git a/parse-xml.c b/parse-xml.c index 9287e0815..3a3f65419 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -220,19 +220,18 @@ static void divetags(char *buffer, void *_tags) struct tag_entry *tags = _tags; int i = 0, start = 0, end = 0; enum ParseState state = FINDEND; - i=0; - while(i < strlen(buffer)) { + int len = buffer ? strlen(buffer) : 0; + + while(i < len) { if (buffer[i] == ',') { if (state == FINDSTART) { /* Detect empty tags */ } else if (state == FINDEND) { /* Found end of tag */ - if (i > 1) { - if(buffer[i-1] != '\\') { - buffer[end-start+1] = '\0'; + if (i > 0 && buffer[i - 1] != '\\') { + buffer[i] = '\0'; state=FINDSTART; taglist_add_tag(tags, buffer+start); - } } else { state=FINDSTART; } @@ -245,18 +244,17 @@ static void divetags(char *buffer, void *_tags) state = FINDEND; start = i; } else if (state == FINDEND) { - end=i; + end = i; } } i++; } if (state == FINDEND) { if (end < start) - end = strlen(buffer)-1; - if (strlen(buffer) > 0) { - buffer[end-start+1] = '\0'; - state=FINDSTART; - taglist_add_tag(tags, buffer+start); + end = len - 1; + if (len > 0) { + buffer[end + 1] = '\0'; + taglist_add_tag(tags, buffer + start); } } } |