15993811 A help message type in ksh93 displays off by one s11-update
authorMohana Rao Gorai <mohana.gorai@oracle.com>
Tue, 01 Apr 2014 23:35:49 -0700
branchs11-update
changeset 3039 bf667aad6d27
parent 3038 1a97ff5e830d
child 3041 21f8567d0e0e
15993811 A help message type in ksh93 displays off by one
components/ksh93/Makefile
components/ksh93/patches/Bug15993811.patch
--- a/components/ksh93/Makefile	Tue Apr 01 22:07:01 2014 -0400
+++ b/components/ksh93/Makefile	Tue Apr 01 23:35:49 2014 -0700
@@ -78,7 +78,8 @@
 					 Bug15794787,15819673.patch \
 					 Bug15808407.patch Bug17714341.patch \
 					 17432413.patch 17824699.patch \
-					 17435456.patch 17851169.patch
+					 17435456.patch 17851169.patch \
+					 Bug15993811.patch
 
 # Fixup HOSTTYPE to match uname output and bits
 HOSTTYPE32=sol11.$(shell uname -p)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ksh93/patches/Bug15993811.patch	Tue Apr 01 23:35:49 2014 -0700
@@ -0,0 +1,11 @@
+--- a/src/cmd/ksh93/sh/nvtype.c	Mon Jun 24 07:10:02 2013
++++ b/src/cmd/ksh93/sh/nvtype.c	Mon Jun 24 08:33:32 2013
+@@ -925,8 +925,6 @@
+ 	}
+ 	offset = roundof(offset,sizeof(char*));
+ 	nv_setsize(mp,offset);
+-	if(nd)
+-		nd++;
+ 	k = roundof(sizeof(Namtype_t),sizeof(Sfdouble_t)) - sizeof(Namtype_t);
+ 	pp = newof(NiL, Namtype_t, 1, nnodes*NV_MINSZ + offset + size + (nnodes+nd)*sizeof(char*) + iref*sizeof(struct Namref)+k);
+ 	pp->fun.dsize = sizeof(Namtype_t)+nnodes*NV_MINSZ +offset+k;