aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2019-11-25 00:36:25 +0100
committerVasyl Gello <vasek.gello@gmail.com>2019-11-26 20:24:31 +0000
commit0f26b8c14dfa59641bca34572f9c0767c8451363 (patch)
treeca286712a3118ab39092cd8d3e15efd660e88def
parent900b3aee2c56beb2a5d2a5aa82dca63d009a7670 (diff)
downloadandroid_external_bash-0f26b8c14dfa59641bca34572f9c0767c8451363.tar.gz
android_external_bash-0f26b8c14dfa59641bca34572f9c0767c8451363.tar.bz2
android_external_bash-0f26b8c14dfa59641bca34572f9c0767c8451363.zip
Bash-4.3 patch 44
A typo prevents the `compat42' shopt option from working as intended. Change-Id: Ifc34db5425d2222854ac4f49809998798fe909fd
-rw-r--r--builtins/shopt.c2
-rw-r--r--builtins/shopt.def2
-rw-r--r--patchlevel.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/builtins/shopt.c b/builtins/shopt.c
index 2fbf016..137cd6e 100644
--- a/builtins/shopt.c
+++ b/builtins/shopt.c
@@ -122,7 +122,7 @@ static struct {
{ "compat32", &shopt_compat32, set_compatibility_level },
{ "compat40", &shopt_compat40, set_compatibility_level },
{ "compat41", &shopt_compat41, set_compatibility_level },
- { "compat42", &shopt_compat41, set_compatibility_level },
+ { "compat42", &shopt_compat42, set_compatibility_level },
#if defined (READLINE)
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
{ "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
diff --git a/builtins/shopt.def b/builtins/shopt.def
index 6050a14..f0f9d99 100644
--- a/builtins/shopt.def
+++ b/builtins/shopt.def
@@ -160,7 +160,7 @@ static struct {
{ "compat32", &shopt_compat32, set_compatibility_level },
{ "compat40", &shopt_compat40, set_compatibility_level },
{ "compat41", &shopt_compat41, set_compatibility_level },
- { "compat42", &shopt_compat41, set_compatibility_level },
+ { "compat42", &shopt_compat42, set_compatibility_level },
#if defined (READLINE)
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
{ "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
diff --git a/patchlevel.h b/patchlevel.h
index 60eb423..4b23f47 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 43
+#define PATCHLEVEL 44
#endif /* _PATCHLEVEL_H_ */