aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Baker <mbm@openwrt.org>2006-11-22 20:17:18 +0000
committerMike Baker <mbm@openwrt.org>2006-11-22 20:17:18 +0000
commitcacb5a0d3d9fe1958968fbfaef034a96d76740b1 (patch)
tree98cb099151e451ff96d435342a1d272590f6c141
parentc0e2282427e95cf503e89e391c8fbea8e7d7d72c (diff)
downloadupstream-cacb5a0d3d9fe1958968fbfaef034a96d76740b1.tar.gz
upstream-cacb5a0d3d9fe1958968fbfaef034a96d76740b1.tar.bz2
upstream-cacb5a0d3d9fe1958968fbfaef034a96d76740b1.zip
add "export -n" to ash
SVN-Revision: 5615
-rw-r--r--package/busybox/patches/250-ash_export-n.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch
new file mode 100644
index 0000000000..9823afeaf5
--- /dev/null
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -0,0 +1,35 @@
+--- busybox.old/shell/ash.c 2006-11-22 12:02:03.000000000 -0800
++++ busybox.dev/shell/ash.c 2006-11-22 11:05:32.000000000 -0800
+@@ -12257,9 +12257,18 @@
+ const char *p;
+ char **aptr;
+ int flag = argv[0][0] == 'r'? VREADONLY : VEXPORT;
++ int mask = ~0;
+ int notp;
+
+- notp = nextopt("p") - 'p';
++ while ((notp = nextopt("np"))) {
++ if (notp == 'n') {
++ mask = ~flag;
++ } else { /* p */
++ break;
++ }
++ }
++
++ notp -= 'p';
+ if (notp && ((name = *(aptr = argptr)))) {
+ do {
+ if ((p = strchr(name, '=')) != NULL) {
+@@ -12267,10 +12276,11 @@
+ } else {
+ if ((vp = *findvar(hashvar(name), name))) {
+ vp->flags |= flag;
++ vp->flags &= mask;
+ continue;
+ }
+ }
+- setvar(name, p, flag);
++ setvar(name, p, flag & mask);
+ } while ((name = *++aptr) != NULL);
+ } else {
+ showvars(argv[0], flag, 0);