mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-16 02:32:11 +02:00
Code Releases Activity

24356: regex =~ test wasnt handled by gettext()

Browse source
This commit is contained in:
Peter Stephenson 2008-01-04 14:45:39 +00:00
parent e3d69e9b36
commit 7d9ead9a46
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-01-04 Peter Stephenson <pws@csr.com>
* 25356: Src/text.c, Test/C02cond.ztst: "=~" wasn't handled by
the code that retrieves a printed representation.
Non-interactively this caused a crash.
2008-01-04 Clint Adams <clint@zsh.org> 2008-01-04 Clint Adams <clint@zsh.org>
* 24349: Functions/Misc/run-help: add comment about HELPDIR to * 24349: Functions/Misc/run-help: add comment about HELPDIR to

3
Src/text.c
View file

@ -732,7 +732,8 @@ gettext2(Estate state)
taddstr(" "); taddstr(" ");
taddstr(ecgetstr(state, EC_NODUP, NULL)); taddstr(ecgetstr(state, EC_NODUP, NULL));
if (ctype == COND_STREQ || if (ctype == COND_STREQ ||
ctype == COND_STRNEQ) ctype == COND_STRNEQ ||
ctype == COND_REGEX)
state->pc++; state->pc++;
} else { } else {
/* Unary test: `-f foo' etc. */ /* Unary test: `-f foo' etc. */

12
Test/C02cond.ztst
View file

@ -211,6 +211,18 @@ F:Failures in these cases do not indicate a problem in the shell.
0:-nt shouldn't abort on non-existent files 0:-nt shouldn't abort on non-existent files
>status = 1 >status = 1
# core dumps on failure
if zmodload -i zsh/regex 2>/dev/null; then
echo >regex_test.sh 'if [[ $# = 1 ]]; then
if [[ $1 =~ /?[^/]+:[0-9]+:$ ]]; then
:
fi
fi
exit 0'
$ZTST_testdir/../Src/zsh -f ./regex_test.sh
fi
0:regex tests shouldn't crash
%clean %clean
# This works around a bug in rm -f in some versions of Cygwin # This works around a bug in rm -f in some versions of Cygwin
chmod 644 unmodish chmod 644 unmodish