From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Cc: "Markus Näher" <markus.naeher@gmx.net>
Subject: [PATCH] vared: Escape empty elements of arrays
Date: Tue, 19 May 2020 23:54:25 +0000 [thread overview]
Message-ID: <20200519235425.13713-1-danielsh@tarpaulin.shahaf.local2> (raw)
---
Found this while replying to Markus.
The %prep block is copied verbatim from several other Test/X*.ztst
files. (Some of them do the zmodload at the end, but some not. I guess
that doesn't matter.)
Cheers,
Daniel
Src/Zle/zle_main.c | 5 ++++-
Test/X05zlebuiltins.ztst | 22 ++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 Test/X05zlebuiltins.ztst
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index 8c0534708..2f6a53a40 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -1721,7 +1721,8 @@ bin_vared(char *name, char **args, Options ops, UNUSED(int func))
return 1;
}
if (v->isarr) {
- /* Array: check for separators and quote them. */
+ /* Array: check for separators and empty elements and quote them. */
+ /* ### TODO: should probably use quotestring() rather than reinvent it */
char **arr = getarrvalue(v), **aptr, **tmparr, **tptr;
tptr = tmparr = (char **)zhalloc(sizeof(char *)*(arrlen(arr)+1));
for (aptr = arr; *aptr; aptr++) {
@@ -1763,6 +1764,8 @@ bin_vared(char *name, char **args, Options ops, UNUSED(int func))
*nptr = '\0';
/* Stick this into the array of words to join up */
*tptr++ = newstr;
+ } else if (t == *aptr) {
+ *tptr++ = "''";
} else
*tptr++ = *aptr; /* No, keep original array element */
}
diff --git a/Test/X05zlebuiltins.ztst b/Test/X05zlebuiltins.ztst
new file mode 100644
index 000000000..1bf7b18b0
--- /dev/null
+++ b/Test/X05zlebuiltins.ztst
@@ -0,0 +1,22 @@
+%prep
+
+ if [[ $OSTYPE = cygwin ]]; then
+ ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
+ elif ( zmodload zsh/zpty 2>/dev/null ); then
+ . $ZTST_srcdir/comptest
+ comptestinit -z $ZTST_testdir/../Src/zsh
+ else
+ ZTST_unimplemented="the zsh/zpty module is not available"
+ fi
+
+%test
+
+ zpty_run 'a=("foo foo" "" "bar")'
+ zletest $'vared a\n\C-xw'
+0:vared: basic quoting test
+>BUFFER: foo\ foo '' bar
+>CURSOR: 15
+
+%clean
+
+ zmodload -ui zsh/zpty
next reply other threads:[~2020-05-19 23:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 23:54 Daniel Shahaf [this message]
2020-05-21 7:05 ` Daniel Shahaf
2020-05-21 10:57 ` Oliver Kiddle
2020-05-21 16:32 ` Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200519235425.13713-1-danielsh@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=markus.naeher@gmx.net \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).