mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a bug if CSV file does not have ending new line

Browse source 
Add a new line when importing a CSV file, so we get the last dive
imported as well (in case file ends without last new line).

See #814

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-01-24 17:03:11 +02:00 committed by Dirk Hohndel
parent 6bb1fee9a6
commit 29c6d03dfa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
file.c
View file

@ -116,13 +116,13 @@ static int try_to_xslt_open_csv(const char *filename, struct memblock *mem, cons
* *
* Tag markers take: strlen("<></>") = 5 * Tag markers take: strlen("<></>") = 5
*/ */
buf = realloc(mem->buffer, mem->size + 6 + strlen(tag) * 2); buf = realloc(mem->buffer, mem->size + 7 + strlen(tag) * 2);
if (buf != NULL) { if (buf != NULL) {
char *starttag = NULL; char *starttag = NULL;
char *endtag = NULL; char *endtag = NULL;
starttag = malloc(3 + strlen(tag)); starttag = malloc(3 + strlen(tag));
endtag = malloc(4 + strlen(tag)); endtag = malloc(5 + strlen(tag));
if (starttag == NULL || endtag == NULL) { if (starttag == NULL || endtag == NULL) {
/* this is fairly silly - so the malloc fails, but we strdup the error? /* this is fairly silly - so the malloc fails, but we strdup the error?
@ -135,12 +135,12 @@ static int try_to_xslt_open_csv(const char *filename, struct memblock *mem, cons
} }
sprintf(starttag, "<%s>", tag); sprintf(starttag, "<%s>", tag);
sprintf(endtag, "</%s>", tag); sprintf(endtag, "\n</%s>", tag);
memmove(buf + 2 + strlen(tag), buf, mem->size); memmove(buf + 2 + strlen(tag), buf, mem->size);
memcpy(buf, starttag, 2 + strlen(tag)); memcpy(buf, starttag, 2 + strlen(tag));
memcpy(buf + mem->size + 2 + strlen(tag), endtag, 4 + strlen(tag)); memcpy(buf + mem->size + 2 + strlen(tag), endtag, 5 + strlen(tag));
mem->size += (5 + 2 * strlen(tag)); mem->size += (6 + 2 * strlen(tag));
mem->buffer = buf; mem->buffer = buf;
free(starttag); free(starttag);