ash: make "locak VAR" unset VAR (bash does that)

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/shell/ash.c b/shell/ash.c
index 04ba447b1f2a9d7e8320389bcaff210d49c4e9f3..7a097c814c309777cf1cd6b2f925cd8c925d8401 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -8960,6 +8960,9 @@ mklocal(char *name)
                        vp->flags |= VSTRFIXED|VTEXTFIXED;
                        if (eq)
                                setvareq(name, 0);
+                       else
+                               /* "local VAR" unsets VAR: */
+                               setvar(name, NULL, 0);
                }
        }
        lvp->vp = vp;

diff --git a/shell/ash_test/ash-misc/local1.right b/shell/ash_test/ash-misc/local1.right
new file mode 100644 (file)
index 0000000..a2d121d
--- /dev/null
+++ b/shell/ash_test/ash-misc/local1.right
@@ -0,0 +1,4 @@
+A1:'A'
+A2:''
+A3:''
+A4:'A'

diff --git a/shell/ash_test/ash-misc/local1.tests b/shell/ash_test/ash-misc/local1.tests
new file mode 100755 (executable)
index 0000000..b1e6750
--- /dev/null
+++ b/shell/ash_test/ash-misc/local1.tests
@@ -0,0 +1,11 @@
+a=A
+f() {
+       local a
+       # the above line unsets $a
+       echo "A2:'$a'"
+       unset a
+       echo "A3:'$a'"
+}
+echo "A1:'$a'"
+f
+echo "A4:'$a'"