[BusyBox-cvs] svn commit: trunk/busybox/shell

pgf at busybox.net pgf at busybox.net
Thu Jul 21 12:03:08 UTC 2005


Author: pgf
Date: 2005-07-21 06:03:05 -0600 (Thu, 21 Jul 2005)
New Revision: 10888

Log:
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.


Modified:
   trunk/busybox/shell/ash.c


Changeset:
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c	2005-07-20 20:26:49 UTC (rev 10887)
+++ trunk/busybox/shell/ash.c	2005-07-21 12:03:05 UTC (rev 10888)
@@ -12001,8 +12001,9 @@
 	}
 	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';




More information about the busybox-cvs mailing list