mirrors/wordsplit
1
0
Fork 0
mirror of git://git.gnu.org.ua/wordsplit.git synced 2025-04-26 00:29:54 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix behaviour of $* and $@ in quoted context

Browse source
This commit is contained in:
Sergey Poznyakoff 2019-05-14 22:25:26 +03:00
parent a19f8397ed
commit c62f40dee0
3 changed files with 62 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/wordsplit.h
View file

@ -120,6 +120,7 @@ struct wordsplit
be allocated with malloc(3). */ be allocated with malloc(3). */
struct wordsplit_node *ws_head, *ws_tail; struct wordsplit_node *ws_head, *ws_tail;
/* Doubly-linked list of parsed out nodes. */ /* Doubly-linked list of parsed out nodes. */
char ws_sep[2]; /* Temporary storage used during splitting */
int ws_lvl; /* Invocation nesting level. */ int ws_lvl; /* Invocation nesting level. */
}; };

30
src/wordsplit.c
View file

@ -256,6 +256,9 @@ wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
if (!(wsp->ws_flags & WRDSF_DELIM)) if (!(wsp->ws_flags & WRDSF_DELIM))
wsp->ws_delim = " \t\n"; wsp->ws_delim = " \t\n";
wsp->ws_sep[0] = wsp->ws_delim[0];
wsp->ws_sep[1] = 0;
if (!(wsp->ws_flags & WRDSF_COMMENT)) if (!(wsp->ws_flags & WRDSF_COMMENT))
wsp->ws_comment = NULL; wsp->ws_comment = NULL;
@ -349,7 +352,7 @@ alloc_space (struct wordsplit *wsp, size_t count)
#define _WSNF_JOIN 0x10 /* node must be joined with the next node */ #define _WSNF_JOIN 0x10 /* node must be joined with the next node */
#define _WSNF_SEXP 0x20 /* is a sed expression */ #define _WSNF_SEXP 0x20 /* is a sed expression */
#define _WSNF_DELIM 0x40 /* node is a delimiter */ #define _WSNF_DELIM 0x40 /* node is a delimiter */
#define _WSNF_CONST 0x80 /* with _WSNF_WORD: v.word is constant */
#define _WSNF_EMPTYOK 0x0100 /* special flag indicating that #define _WSNF_EMPTYOK 0x0100 /* special flag indicating that
wordsplit_add_segm must add the wordsplit_add_segm must add the
segment even if it is empty */ segment even if it is empty */
@ -441,7 +444,7 @@ wsnode_new (struct wordsplit *wsp, struct wordsplit_node **pnode)
static void static void
wsnode_free (struct wordsplit_node *p) wsnode_free (struct wordsplit_node *p)
{ {
if (p->flags & _WSNF_WORD) if ((p->flags & (_WSNF_WORD|_WSNF_CONST)) == _WSNF_WORD)
free (p->v.word); free (p->v.word);
free (p); free (p);
} }
@ -1250,6 +1253,7 @@ expand_paramv (struct wordsplit *wsp, struct wordsplit_node **ptail, int flg,
| (WSP_RETURN_DELIMS (wsp) ? WRDSF_RETURN_DELIMS : 0) | (WSP_RETURN_DELIMS (wsp) ? WRDSF_RETURN_DELIMS : 0)
| (q ? WRDSF_NOSPLIT : 0); | (q ? WRDSF_NOSPLIT : 0);
size_t i; size_t i;
struct wordsplit_node *tail = *ptail;
for (i = 0; i < wsp->ws_paramc; i++) for (i = 0; i < wsp->ws_paramc; i++)
{ {
@ -1288,6 +1292,28 @@ expand_paramv (struct wordsplit *wsp, struct wordsplit_node **ptail, int flg,
} }
if (wsflags & WRDSF_REUSE) if (wsflags & WRDSF_REUSE)
wordsplit_free (&ws); wordsplit_free (&ws);
if (flg & _WSNF_QUOTE)
{
tail = tail->next;
/* Insert delimiters, mark nodes as joinable */
while (tail != *ptail)
{
struct wordsplit_node *next = tail->next;
struct wordsplit_node *newnode;
tail->flags |= _WSNF_JOIN;
if (wsnode_new (wsp, &newnode))
return 1;
newnode->flags = _WSNF_WORD | _WSNF_CONST | _WSNF_NOEXPAND | _WSNF_JOIN;
newnode->v.word = wsp->ws_sep;
wsnode_insert (wsp, newnode, tail, 0);
tail = next;
}
}
return 0; return 0;
} }

34
tests/wordsplit.at
View file

@ -974,7 +974,9 @@ TOTAL: 1
TESTWSP([$* and $@],[],['one two' three 'four five'], TESTWSP([$* and $@],[],['one two' three 'four five'],
[$* [$*
$@], $@
"$*"
"$@"],
[NF: 5 [NF: 5
0: one 0: one
1: two 1: two
@ -987,6 +989,36 @@ NF: 3
1: three 1: three
2: "four five" 2: "four five"
TOTAL: 3 TOTAL: 3
NF: 1
0: "one two three four five"
TOTAL: 1
NF: 1
0: "one two three four five"
TOTAL: 1
])
TESTWSP([$* and $@ in nosplit mode],[],
[-trimnl -nosplit 'one two' three 'four five'],
[$*
$@],
[NF: 1
0: "one two three four five"
TOTAL: 1
NF: 1
0: "one two three four five"
TOTAL: 1
])
TESTWSP([$* and $@ in nosplit mode with delimiter],[],
[-trimnl -nosplit -delim : 'one two' three 'four five'],
[$*
$@],
[NF: 1
0: "one two:three:four five"
TOTAL: 1
NF: 1
0: "one two:three:four five"
TOTAL: 1
]) ])
m4_popdef([TESTWSP]) m4_popdef([TESTWSP])