diff options
author | Paul Fox <pgf@brightstareng.com> | 2005-07-21 12:03:05 +0000 |
---|---|---|
committer | Paul Fox <pgf@brightstareng.com> | 2005-07-21 12:03:05 +0000 |
commit | 8de331def08568678fa09536b5589ea473bee6e6 (patch) | |
tree | b5f1accbe77c45fe27b54d48d5cf255a7bfc8cbd | |
parent | 0840b76602900f8236f444b68da16d5c8d57ac3d (diff) | |
download | busybox-w32-8de331def08568678fa09536b5589ea473bee6e6.tar.gz busybox-w32-8de331def08568678fa09536b5589ea473bee6e6.tar.bz2 busybox-w32-8de331def08568678fa09536b5589ea473bee6e6.zip |
revert 10881, and refix by changing "if (vallen)" to "if (val)". this
is per the upstream fix for dash, in dash_0.5.2-6.diff. thanks vodz, for
catching this.
-rw-r--r-- | shell/ash.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c index 8656c0219..783204933 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -12001,8 +12001,9 @@ setvar(const char *name, const char *val, int flags) | |||
12001 | } | 12001 | } |
12002 | INTOFF; | 12002 | INTOFF; |
12003 | p = mempcpy(nameeq = ckmalloc(namelen + vallen + 2), name, namelen); | 12003 | p = mempcpy(nameeq = ckmalloc(namelen + vallen + 2), name, namelen); |
12004 | *p++ = '='; | 12004 | *p++ = '\0'; |
12005 | if (vallen) { | 12005 | if (val) { |
12006 | p[-1] = '='; | ||
12006 | p = mempcpy(p, val, vallen); | 12007 | p = mempcpy(p, val, vallen); |
12007 | } | 12008 | } |
12008 | *p = '\0'; | 12009 | *p = '\0'; |