hyung-hwan/hawk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhanced split() and splitting by FS to support the escape doubling scheme
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hyung-hwan
2025-09-27 11:37:25 +09:00
parent 0ffe46992b
commit 2c544ae383
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/misc-imp.h
View File

@ -30,6 +30,10 @@ char_t* split_xchars_to_fields (hawk_rtx_t* rtx, char_t* str, hawk_oow_t len, ch
char_t* ts; /* token start */
char_t* tp; /* points to one char past the last token char */
char_t* xp; /* points to one char past the last effective char */
int escape_doubling;
/* to extract "abc""def" as abc"def */
escape_doubling = (ec == lq && ec == rq);
/* skip leading spaces */
while (p < end && is_xch_space(*p)) p++;
@ -48,8 +52,9 @@ char_t* split_xchars_to_fields (hawk_rtx_t* rtx, char_t* str, hawk_oow_t len, ch
}
else
{
if (c == ec)
if (!escape_doubling && c == ec)
{
/* normal escaping is never activated if escaping with two repeated characters is on */
escaped = 1;
p++;
}
@ -57,11 +62,17 @@ char_t* split_xchars_to_fields (hawk_rtx_t* rtx, char_t* str, hawk_oow_t len, ch
{
if (c == rq)
{
if (escape_doubling && (p + 1) < end && *(p + 1) == rq)
{
p++;
goto not_rq;
}
quoted = 0;
p++;
}
else
{
not_rq:
*tp++ = c; xp = tp; p++;
}
}

1
lib/rio.c
View File

@ -683,7 +683,6 @@ int hawk_rtx_readio (hawk_rtx_t* rtx, hawk_in_type_t in_type, const hawk_ooch_t*
return ret;
}
int hawk_rtx_readiobytes (hawk_rtx_t* rtx, hawk_in_type_t in_type, const hawk_ooch_t* name, hawk_becs_t* buf)
{
hawk_rio_arg_t* p;