mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-12-29 16:25:35 +01:00
29731: fix read -AE, test that and read -Ae
This commit is contained in:
parent
ca7269e82d
commit
af071465b1
3 changed files with 23 additions and 3 deletions
|
@ -1,5 +1,8 @@
|
|||
2011-08-28 Peter Stephenson <p.w.stephenson@ntlworld.com>
|
||||
|
||||
* 29731: Src/builtin.c, Test/B04read.ztst: fix output from `read
|
||||
-AE' and test that and `read -Ae'.
|
||||
|
||||
* users/16289: Doc/Zsh/expn.yo, Src/exec.c, Src/jobs.c: don't
|
||||
delete temporary files when disowning and document this.
|
||||
|
||||
|
@ -15335,5 +15338,5 @@
|
|||
|
||||
*****************************************************
|
||||
* This is used by the shell to define $ZSH_PATCHLEVEL
|
||||
* $Revision: 1.5446 $
|
||||
* $Revision: 1.5447 $
|
||||
*****************************************************
|
||||
|
|
|
@ -5549,7 +5549,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
|
|||
*bptr = '\0';
|
||||
#endif
|
||||
/* dispose of word appropriately */
|
||||
if (OPT_ISSET(ops,'e') || OPT_ISSET(ops,'E')) {
|
||||
if (OPT_ISSET(ops,'e')) {
|
||||
zputs(buf, stdout);
|
||||
putchar('\n');
|
||||
}
|
||||
|
@ -5581,7 +5581,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
|
|||
: (char **)zalloc((al + 1) * sizeof(char *)));
|
||||
|
||||
for (pp = p, n = firstnode(readll); n; incnode(n)) {
|
||||
if (OPT_ISSET(ops,'e') || OPT_ISSET(ops,'E')) {
|
||||
if (OPT_ISSET(ops,'E')) {
|
||||
zputs((char *) getdata(n), stdout);
|
||||
putchar('\n');
|
||||
}
|
||||
|
|
|
@ -93,3 +93,20 @@
|
|||
read foo) <<<bar
|
||||
1:return status on failing to set parameter
|
||||
?(eval):2: read-only variable: foo
|
||||
|
||||
read -AE array <<<'one two three'
|
||||
print ${(j.:.)array}
|
||||
0:Behaviour of -A and -E combination
|
||||
>one
|
||||
>two
|
||||
>three
|
||||
>one:two:three
|
||||
|
||||
array=()
|
||||
read -Ae array <<<'four five six'
|
||||
print ${(j.:.)array}
|
||||
0:Behaviour of -A and -e combination
|
||||
>four
|
||||
>five
|
||||
>six
|
||||
>
|
||||
|
|
Loading…
Reference in a new issue