aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2014-03-28 11:52:47 -0400
committerChet Ramey <chet.ramey@case.edu>2014-03-28 11:52:47 -0400
commitf5c8237d0dfdd8a68f5ec97cff6547033681d695 (patch)
tree25013cb76f8843bf2ae119865c5edb91361b3075
parentac50fbac377e32b98d2de396f016ea81e8ee9961 (diff)
downloadandroid_external_bash-f5c8237d0dfdd8a68f5ec97cff6547033681d695.tar.gz
android_external_bash-f5c8237d0dfdd8a68f5ec97cff6547033681d695.tar.bz2
android_external_bash-f5c8237d0dfdd8a68f5ec97cff6547033681d695.zip
Bash-4.3 patch 1
-rw-r--r--patchlevel.h2
-rw-r--r--test.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/patchlevel.h b/patchlevel.h
index d3516b2..15f3c51 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 7f0b28d..ab7bec7 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);
}