From 7db4f70b7f4a6b9ac4a66763eebc50265f4600bc Mon Sep 17 00:00:00 2001 From: pgf Date: Thu, 21 Jul 2005 12:03:05 +0000 Subject: 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. git-svn-id: svn://busybox.net/trunk/busybox@10888 69ca8d6d-28ef-0310-b511-8ec308f3f277 --- shell/ash.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'shell') 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) } INTOFF; p = mempcpy(nameeq = ckmalloc(namelen + vallen + 2), name, namelen); - *p++ = '='; - if (vallen) { + *p++ = '\0'; + if (val) { + p[-1] = '='; p = mempcpy(p, val, vallen); } *p = '\0'; -- cgit v1.2.3-55-g6feb