diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-03-20 14:14:30 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-20 14:14:30 +0000 |
| commit | f310b20ac2455d91db79325650f6368fc922a3f8 (patch) | |
| tree | b7ebc7fe20f5d5667077fb9950497c84dc59c464 | |
| parent | 3f2d9211d7c9b68232ae60965f84cbae5a67b69b (diff) | |
| download | upstream-f310b20ac2455d91db79325650f6368fc922a3f8.tar.gz upstream-f310b20ac2455d91db79325650f6368fc922a3f8.tar.bz2 upstream-f310b20ac2455d91db79325650f6368fc922a3f8.zip | |
busybox: fix existing "export -n" in ash
Minor fix to existing patch which did not correctly implement -n support for the export command in ash. The VEXPORT flag of a variable was set in the first call to setvareq() and then remained set in the subsequent call, because the variable already existed in the environment.
Although /lib/functions.sh by default does not export variables (NO_EXPORT=1), this issue was leading to dirty environments.
Without this fix:
(ash) export A=1; export -n B=2; /bin/ash -c "echo \$A, \$B"
1, 2
With this fix:
(ash) export A=1; export -n B=2; /bin/ash -c "echo \$A, \$B"
1,
Signed-off-by: Christophe Lermytte <openwrt@lermytte.be>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39968 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/utils/busybox/patches/250-ash_export-n.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/utils/busybox/patches/250-ash_export-n.patch b/package/utils/busybox/patches/250-ash_export-n.patch index 048c236b85..ddbe74ee29 100644 --- a/package/utils/busybox/patches/250-ash_export-n.patch +++ b/package/utils/busybox/patches/250-ash_export-n.patch @@ -19,7 +19,7 @@ aptr = argptr; name = *aptr; if (name) { -@@ -12624,10 +12633,12 @@ exportcmd(int argc UNUSED_PARAM, char ** +@@ -12624,10 +12633,11 @@ exportcmd(int argc UNUSED_PARAM, char ** vp = *findvar(hashvar(name), name); if (vp) { vp->flags |= flag; @@ -27,7 +27,7 @@ continue; } } - setvar(name, p, flag); +- setvar(name, p, flag); + setvar(name, p, flag & mask); } while ((name = *++aptr) != NULL); return 0; |