commit 109ee5d33694a03cda3424b4846584250832ba8e
"ash: make "locak VAR" unset VAR (bash does that)"
This commit introduced a regression where calling local on an already
local variable unsets it. This does not match bash behavior.
Update test case to check for this behavior
Signed-off-by: Felix Fietkau <n...@openwrt.org>
---
shell/ash.c | 17 ++++++++++++++++-
shell/ash_test/ash-misc/local1.right | 5 +++--
shell/ash_test/ash-misc/local1.tests | 7 +++++--
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/shell/ash.c b/shell/ash.c
index b568013..c95bd67 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -8958,6 +8958,21 @@ parse_command_args(char **argv, const char **path)
}
#endif
+static bool
+findlocal(struct var *vp)
+{
+ struct localvar *lvp = localvars;
+
+ while (lvp) {
+ if (lvp->vp == vp)
+ return true;
+
+ lvp = lvp->next;
+ }
+
+ return false;
+}
+
/*
* Make a variable a local variable. When a variable is made local, it's
* value and flags are saved in a localvar structure. The saved values
@@ -8997,7 +9012,7 @@ mklocal(char *name)
vp->flags |= VSTRFIXED|VTEXTFIXED;
if (eq)
setvareq(name, 0);
- else
+ else if (!findlocal(vp))
/* "local VAR" unsets VAR: */
setvar(name, NULL, 0);
}
diff --git a/shell/ash_test/ash-misc/local1.right
b/shell/ash_test/ash-misc/local1.right
index a2d121d..4efba35 100644
--- a/shell/ash_test/ash-misc/local1.right
+++ b/shell/ash_test/ash-misc/local1.right
@@ -1,4 +1,5 @@
A1:'A'
A2:''
-A3:''
-A4:'A'
+A3:'B'
+A4:''
+A5:'A'
diff --git a/shell/ash_test/ash-misc/local1.tests
b/shell/ash_test/ash-misc/local1.tests
index b1e6750..bc4c1da 100755
--- a/shell/ash_test/ash-misc/local1.tests
+++ b/shell/ash_test/ash-misc/local1.tests
@@ -3,9 +3,12 @@ f() {
local a
# the above line unsets $a
echo "A2:'$a'"
- unset a
+ a=B
+ local a
echo "A3:'$a'"
+ unset a
+ echo "A4:'$a'"
}
echo "A1:'$a'"
f
-echo "A4:'$a'"
+echo "A5:'$a'"
--
2.2.2
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
