From: Chet Ramey Date: Fri, 28 Mar 2014 15:52:47 +0000 (-0400) Subject: Bash-4.3 patch 1 X-Git-Tag: bash-4.4~46 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fbash.git;a=commitdiff_plain;h=f5c8237d0dfdd8a68f5ec97cff6547033681d695 Bash-4.3 patch 1 --- diff --git a/patchlevel.h b/patchlevel.h index d3516b226..15f3c51ca 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 0 +#define PATCHLEVEL 1 #endif /* _PATCHLEVEL_H_ */ diff --git a/test.c b/test.c index 7f0b28d54..ab7bec79f 100644 --- a/test.c +++ b/test.c @@ -646,8 +646,8 @@ unary_test (op, arg) return (v && invisible_p (v) == 0 && var_isset (v) ? TRUE : FALSE); case 'R': - v = find_variable (arg); - return (v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v) ? TRUE : FALSE); + v = find_variable_noref (arg); + return ((v && invisible_p (v) == 0 && var_isset (v) && nameref_p (v)) ? TRUE : FALSE); } /* We can't actually get here, but this shuts up gcc. */ @@ -723,6 +723,7 @@ test_unop (op) case 'o': case 'p': case 'r': case 's': case 't': case 'u': case 'v': case 'w': case 'x': case 'z': case 'G': case 'L': case 'O': case 'S': case 'N': + case 'R': return (1); }