summaryrefslogtreecommitdiffabout
path: root/src/wordsplit.c
Side-by-side diff
Diffstat (limited to 'src/wordsplit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/wordsplit.c30
1 files changed, 28 insertions, 2 deletions
diff --git a/src/wordsplit.c b/src/wordsplit.c
index f563725..4e633fa 100644
--- a/src/wordsplit.c
+++ b/src/wordsplit.c
@@ -258,2 +258,5 @@ wordsplit_init (struct wordsplit *wsp, const char *input, size_t len,
+ wsp->ws_sep[0] = wsp->ws_delim[0];
+ wsp->ws_sep[1] = 0;
+
if (!(wsp->ws_flags & WRDSF_COMMENT))
@@ -351,3 +354,3 @@ alloc_space (struct wordsplit *wsp, size_t count)
#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
@@ -443,3 +446,3 @@ wsnode_free (struct wordsplit_node *p)
{
- if (p->flags & _WSNF_WORD)
+ if ((p->flags & (_WSNF_WORD|_WSNF_CONST)) == _WSNF_WORD)
free (p->v.word);
@@ -1252,2 +1255,3 @@ expand_paramv (struct wordsplit *wsp, struct wordsplit_node **ptail, int flg,
size_t i;
+ struct wordsplit_node *tail = *ptail;
@@ -1290,2 +1294,24 @@ expand_paramv (struct wordsplit *wsp, struct wordsplit_node **ptail, int flg,
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 to:

Send suggestions and report system problems to the System administrator.