mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 05:00:59 +01:00
Code Releases Activity

29530: ${...?...} shouldn't cause an error with NO_EXEC option

Browse source
This commit is contained in:
Peter Stephenson 2011-07-01 15:23:01 +00:00
parent 47347fc7d7
commit ad29258c8c
3 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-01 Peter Stephenson <pws@csr.com>
* 29530: Src/subst.c, Test/E01options.ztst: ${..?..} shouldn't
cause an error with NO_EXEC option.
2011-07-01 Frank Terbeck <ft@bewatermyfriend.org>
* 29518: Completion/Unix/Command/_git: Fall back to file
@ -15077,5 +15082,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5389 $
* $Revision: 1.5390 $
*****************************************************

6
Src/subst.c
View file

@ -2715,19 +2715,21 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int ssub)
case '?':
case Quest:
if (vunset) {
if (isset(EXECOPT)) {
*idend = '\0';
zerr("%s: %s", idbeg, *s ? s : "parameter not set");
if (!interact) {
if (mypid == getpid()) {
/*
* paranoia: don't check for jobs, but there shouldn't
* be any if not interactive.
* paranoia: don't check for jobs, but there
* shouldn't be any if not interactive.
*/
stopmsg = 1;
zexit(1, 0);
} else
_exit(1);
}
}
return NULL;
}
break;

4
Test/E01options.ztst
View file

@ -353,6 +353,10 @@
echo *NonExistentFile*)
0:NO_EXEC option should not do globbing
(setopt noexec
echo ${unset_var?Not an error})
0:NO_EXEC should not test for unset variables
setopt NO_eval_lineno
eval 'print $LINENO'
setopt eval_lineno