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
New utility: nmem_strsplit_escape2
[yaz-moved-to-github.git]
/
src
/
nmemsdup.c
diff --git
a/src/nmemsdup.c
b/src/nmemsdup.c
index
75b6e85
..
9584cff
100644
(file)
--- a/
src/nmemsdup.c
+++ b/
src/nmemsdup.c
@@
-74,6
+74,14
@@
void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
char ***darray, int *num, int collapse,
int escape_char)
{
char ***darray, int *num, int collapse,
int escape_char)
{
+ nmem_strsplit_escape2(nmem, delim, dstr, darray, num, collapse,
+ escape_char, 1);
+}
+
+void nmem_strsplit_escape2(NMEM nmem, const char *delim, const char *dstr,
+ char ***darray, int *num, int collapse,
+ int escape_char, int subst_escape)
+{
*darray = 0;
/* two passes over the input string.. */
while (1)
*darray = 0;
/* two passes over the input string.. */
while (1)
@@
-102,16
+110,19
@@
void nmem_strsplit_escape(NMEM nmem, const char *delim, const char *dstr,
}
if (*darray)
{
}
if (*darray)
{
- char *dst, *src;
(*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
(*darray)[i] = nmem_strdupn(nmem, cp0, cp - cp0);
- dst = src = (*darray)[i];
- while (*src != '\0')
+ if (subst_escape)
{
{
- if (*src == escape_char && src[1])
- src++;
- *dst++ = *src++;
+ char *dst = (*darray)[i];
+ const char *src = dst;
+ while (*src != '\0')
+ {
+ if (*src == escape_char && src[1])
+ src++;
+ *dst++ = *src++;
+ }
+ *dst = '\0';
}
}
- *dst = '\0';
}
i++;
if (!collapse)
}
i++;
if (!collapse)