projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another fix for nmem_strsplit_escape
[yaz-moved-to-github.git]
/
src
/
nmemsdup.c
diff --git
a/src/nmemsdup.c
b/src/nmemsdup.c
index
a0fa637
..
75b6e85
100644
(file)
--- a/
src/nmemsdup.c
+++ b/
src/nmemsdup.c
@@
-105,11
+105,13
@@
void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
char *dst, *src;
(*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
dst = src = (*darray)[i];
char *dst, *src;
(*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
dst = src = (*darray)[i];
- for (; (*dst = *src) != '\0'; src++)
+ while (*src != '\0')
{
{
- if (*src != escape_char)
- dst++;
+ if (*src == escape_char && src[1])
+ src++;
+ *dst++ = *src++;
}
}
+ *dst = '\0';
}
i++;
if (!collapse)
}
i++;
if (!collapse)