Portions contributed by Olga Kryzhanovska <olga.kryzhanovska@gmail.com>

PSARC/2009/063 ksh93 update 2
PSARC/2009/248 ksh93 update to 2009-03-10
PSARC/2009/249 more ksh93 command conversions
6888396 libast sources should not include localedef.h
6605478 ksh93 profile shell option does not work
6631006 ksh93 hangs in situations that ksh handles okay
6661487 logname reports nothing after running the script command
6705126 first call to read doesn't honor new setting of HISTFILE
6764665 *libpp* Array overrun in libpp
6765756 *libast* Array overruns in libast
6769332 Recursive function+command substitutions terminate shell after 257 iterations
6777491 *ksh93* lacks arithmetric function iszero()
6778077 *ksh93* does not understand "THAW" as a signal for use with trap
6789247 [ku1] libast/ksh93 1-digit hexfloat base conversion rounds incorrectly
6791838 *ksh93* unset of a variable which is not set should return 0
6793714 RFE: Update /usr/bin/comm to AT&T AST "comm"
6793719 RFE: Update /usr/bin/cut to AT&T AST "cut"
6793721 RFE: Update /usr/bin/paste to AT&T AST "paste"
6793722 RFE: Update /usr/bin/cmp to AT&T AST "cmp"
6793726 RFE: Update /usr/bin/uniq to AT&T AST "uniq"
6793735 RFE: Update /usr/bin/wc to AT&T AST "wc"
6793744 RFE: Add /usr/share/doc/ksh/ for ksh93 documentation
6793747 RFE: Provide "print" builtin as /usr/bin/print for external applications
6793763 RFE: Update /usr/bin/ksh93 to ast-ksh.2009-05-05
6794952 RFE: Enable "globstar" mode in /etc/ksh.kshrc (= interactive ksh93 shells)
6805792 [ku1] Moving local compound var into array does not work
6805794 [ku1] printf returns "invalid character constant" for $ printf "%d\n" "'<euro>"
6805795 [ku1] ksh93 does not differ between -0 and +0
6805797 [ku1]Can't append to nodes of an array of compound vars if addressing them via nameref
6805799 Indexed compound variable arrays do not work...
6805800 [ku1] Declaring associative compound array does not work
6805813 RFE: Update /usr/bin/join to AT&T AST "join".
6805819 RFE: Update /usr/bin/tee to AT&T AST "tee".
6809663 shlint missing ending newline on errors
6811916 ksh93 repeatedly segfaults when "tee" builtin is interrupted via <ctrl-c> in interactive mode
6821113 SUNWosdem package issues
6828644 RFE: Update /usr/bin/logname to AT&T AST "logname".
6828692 RFE: Update /usr/bin/cksum to AT&T AST "cksum".
6834184 ksh93 gets SIGSEGV if HISTFILE is changed in place.
6834207 ksh93 gets SIGSEGV on interactive function definition with HISTSIZE unset
6835835 ksh93 "cat" builtin does not handle "-n" correctly
6841442 Need exception list for OS/Net trees managed via Subversion
6848486 "echo ${test}" with test undefined crashes the shell
6850672 ksh93 (VISUAL=vi) crashes with memory fault while scrolling through history
6855875 typeset -X x ; print $x # does not print sufficient digits to restore value
6857344 /usr/bin/hash core dump with invalid arguments
6866676 Need test suite module to test the kernel support for compiled shell scripts
6881017 Subshell doesn't exit, holds pipe open preventing callers from exiting
6884409 fts functions in libast library can result in segv with deep dir trees (similar to CERT VU#590371)

1 files changed, 311 insertions, 142 deletions

diff --git a/usr/src/lib/libcmd/common/cat.c b/usr/src/lib/libcmd/common/cat.c
index 76af2f2765..e451998cc2 100644
--- a/usr/src/lib/libcmd/common/cat.c
+++ b/usr/src/lib/libcmd/common/cat.c
@@ -1,7 +1,7 @@
 /***********************************************************************
 *                                                                      *
 *               This software is part of the ast package               *
-*          Copyright (c) 1992-2008 AT&T Intellectual Property          *
+*          Copyright (c) 1992-2009 AT&T Intellectual Property          *
 *                      and is licensed under the                       *
 *                  Common Public License, Version 1.0                  *
 *                    by AT&T Intellectual Property                     *
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 
 static const char usage[] =
-"[-?\n@(#)$Id: cat (AT&T Research) 2007-07-17 $\n]"
+"[-?\n@(#)$Id: cat (AT&T Research) 2009-03-31 $\n]"
 USAGE_LICENSE
 "[+NAME?cat - concatenate files]"
 "[+DESCRIPTION?\bcat\b copies each \afile\a in sequence to the standard"
@@ -62,6 +62,7 @@ USAGE_LICENSE
 "[D:dos-output?Output files are opened in \atext\amode which inserts carriage"
 "	returns in front of new-lines on some systems.]"
 "[E:show-ends?Causes a \b$\b to be inserted before each new-line.]"
+"[R:regress?Regression test defaults: \b-v\b buffer size 4.]"
 "[S:silent?\bcat\b is silent about non-existent files.]"
 "[T:show-blank?Causes tabs to be copied as \b^I\b and formfeeds as \b^L\b.]"
 
@@ -87,146 +88,306 @@ USAGE_LICENSE
 #define d_FLAG		(1<<9)
 
 /* character types */
-#define T_ENDBUF	1
-#define T_CONTROL	2
-#define T_NEWLINE	3
-#define T_EIGHTBIT	4
-#define T_CNTL8BIT	5
+#define T_ERROR		1
+#define T_EOF		2
+#define T_ENDBUF	3
+#define T_NEWLINE	4
+#define T_CONTROL	5
+#define T_EIGHTBIT	6
+#define T_CNTL8BIT	7
 
 #define printof(c)	((c)^0100)
 
+typedef void* (*Reserve_f)(Sfio_t*, ssize_t, int);
+
+#ifndef sfvalue
+#define sfvalue(f)	((f)->_val)
+#endif
+
+static void*
+regress(Sfio_t* sp, ssize_t n, int f)
+{
+	void*	r;
+
+	if (!(r = sfreserve(sp, 4, f)))
+		r = sfreserve(sp, n, f);
+	else if (sfvalue(sp) > 4)
+		sfvalue(sp) = 4;
+	return r;
+}
+
 /*
  * called for any special output processing
  */
 
 static int
-vcat(register char* states, Sfio_t *fdin, Sfio_t *fdout, int flags)
+vcat(register char* states, Sfio_t* ip, Sfio_t* op, Reserve_f reserve, int flags)
 {
 	register unsigned char*	cp;
-	register unsigned char*	cpold;
+	register unsigned char*	pp;
+	unsigned char*		cur;
+	unsigned char*		end;
+	unsigned char*		buf;
+	unsigned char*		nxt;
 	register int		n;
-	register int		m;
-	register int		line = 1;
-	register unsigned char*	endbuff;
-	unsigned char*		inbuff;
-	int			printdefer = (flags&(B_FLAG|N_FLAG));
-	int			lastchar;
-	int			lastline;
+	register int		line;
+	register int		raw;
+	int			last;
+	int			c;
+	int			m;
+	int			any;
+	int			header;
 
 	unsigned char		meta[4];
+	unsigned char		tmp[32];
 
 	meta[0] = 'M';
 	meta[1] = '-';
+	last = -1;
+	*(cp = buf = end = tmp) = 0;
+	any = 0;
+	header = flags & (B_FLAG|N_FLAG);
+	line = 1;
+	states[0] = T_ENDBUF;
+	raw = !mbwide();
 	for (;;)
 	{
-		/* read in a buffer full */
-		if (!(inbuff = (unsigned char*)sfreserve(fdin, SF_UNBOUND, 0)))
-			return sfvalue(fdin) ? -1 : 0;
-		if ((n = sfvalue(fdin)) <= 0)
-			return n;
-		cp = inbuff;
-		lastchar = *(endbuff = cp + --n);
-		*endbuff = 0;
-		if (printdefer)
+		cur = cp;
+		if (raw)
+			while (!(n = states[*cp++]));
+		else
+			for (;;)
+			{
+				while (!(n = states[*cp++]));
+				if (n < T_CONTROL)
+					break;
+				if ((m = mbsize(pp = cp - 1)) > 1)
+					cp += m - 1;
+				else
+				{
+					if (m <= 0)
+					{
+						if (cur == pp)
+						{
+							if (last > 0)
+							{
+								*end = last;
+								last = -1;
+								c = end - pp + 1;
+								if ((m = mbsize(pp)) == c)
+								{
+									any = 1;
+									if (header)
+									{
+										header = 0;
+										sfprintf(op, "%6d\t", line);
+									}
+									sfwrite(op, cur, m);
+									*(cp = cur = end) = 0;
+								}
+								else
+								{
+									memcpy(tmp, pp, c);
+									if (!(nxt = (unsigned char*)(*reserve)(ip, SF_UNBOUND, 0)))
+									{
+										states[0] = sfvalue(ip) ? T_ERROR : T_EOF;
+										*(cp = end = tmp + sizeof(tmp) - 1) = 0;
+										last = -1;
+									}
+									else if ((n = sfvalue(ip)) <= 0)
+									{
+										states[0] = n ? T_ERROR : T_EOF;
+										*(cp = end = tmp + sizeof(tmp) - 1) = 0;
+										last = -1;
+									}
+									else
+									{
+										cp = buf = nxt;
+										end = buf + n - 1;
+										last = *end;
+										*end = 0;
+									}
+ mb:
+									if ((n = end - cp + 1) >= (sizeof(tmp) - c))
+										n = sizeof(tmp) - c - 1;
+									memcpy(tmp + c, cp, n);
+									if ((m = mbsize(tmp)) >= c)
+									{
+										any = 1;
+										if (header)
+										{
+											header = 0;
+											sfprintf(op, "%6d\t", line);
+										}
+										sfwrite(op, tmp, m);
+										cur = cp += m - c;
+									}
+								}
+								continue;
+							}
+						}
+						else
+						{
+							cp = pp + 1;
+							n = 0;
+						}
+					}
+					break;
+				}
+			}
+		c = *--cp;
+		if ((m = cp - cur) || n >= T_CONTROL)
 		{
-			if (states[*cp]!=T_NEWLINE || !(flags&B_FLAG))
-				sfprintf(fdout,"%6d\t",line);
-			printdefer = 0;
+ flush:
+			any = 1;
+			if (header)
+			{
+				header = 0;
+				sfprintf(op, "%6d\t", line);
+			}
+			if (m)
+				sfwrite(op, cur, m);
 		}
-		while (endbuff)
+ special:
+		switch (n)
 		{
-			cpold = cp;
-			/* skip over printable characters */
-			if (mbwide())
-				while ((n = (m = mbsize(cp)) < 2 ? states[*cp++] : (cp += m, states['a'])) == 0);
+		case T_ERROR:
+			if (cp != end)
+			{
+				n = T_CONTROL;
+				goto flush;
+			}
+			return -1;
+		case T_EOF:
+			if (cp != end)
+			{
+				n = T_CONTROL;
+				goto flush;
+			}
+			return 0;
+		case T_ENDBUF:
+			if (cp != end)
+			{
+				n = T_CONTROL;
+				goto flush;
+			}
+			c = last;
+			if (!(nxt = (unsigned char*)(*reserve)(ip, SF_UNBOUND, 0)))
+			{
+				*(cp = end = tmp) = 0;
+				states[0] = sfvalue(ip) ? T_ERROR : T_EOF;
+				last = -1;
+			}
+			else if ((m = sfvalue(ip)) <= 0)
+			{
+				*(cp = end = tmp) = 0;
+				states[0] = m ? T_ERROR : T_EOF;
+				last = -1;
+			}
 			else
-				while ((n = states[*cp++]) == 0);
-			if (n==T_ENDBUF)
 			{
-				if (cp>endbuff)
+				buf = nxt;
+				end = buf + m - 1;
+				last = *end;
+				*end = 0;
+				cp = buf;
+			}
+			if (c >= 0)
+			{
+				if (!(n = states[c]))
 				{
-					if (!(n = states[lastchar]))
-					{
-						*endbuff = lastchar;
-						cp++;
-					}
-					else
-					{
-						if (--cp > cpold)
-							sfwrite(fdout,(char*)cpold,cp-cpold);
-						if (endbuff==inbuff)
-							*++endbuff = 0;
-						cp = cpold = endbuff;
-						cp[-1] = lastchar;
-						if (n==T_ENDBUF)
-							n = T_CONTROL;
-						
-					}
-					endbuff = 0;
+					*(cur = tmp) = c;
+					m = 1;
+					goto flush;
 				}
-				else n = T_CONTROL;
+				if (raw || n < T_CONTROL)
+				{
+					cp--;
+					goto special;
+				}
+				tmp[0] = c;
+				c = 1;
+				goto mb;
 			}
-			if (--cp>cpold)
-				sfwrite(fdout,(char*)cpold,cp-cpold);
-			switch(n)
+			break;
+		case T_CONTROL:
+			do
 			{
-				case T_CNTL8BIT:
-					meta[2] = '^';
-					do
-					{
-						n = (*cp++)&~0200;
-						meta[3] = printof(n);
-						sfwrite(fdout,(char*)meta,4);
-					}
-					while ((n=states[*cp])==T_CNTL8BIT);
-					break;
-				case T_EIGHTBIT:
-					do
-					{
-						meta[2] = (*cp++)&~0200;
-						sfwrite(fdout,(char*)meta,3);
-					}
-					while ((n=states[*cp])==T_EIGHTBIT);
-					break;
-				case T_CONTROL:
-					do
+				sfputc(op, '^');
+				sfputc(op, printof(c));
+			} while (states[c = *++cp] == T_CONTROL);
+			break;
+		case T_CNTL8BIT:
+			meta[2] = '^';
+			do
+			{
+				n = c & ~0200;
+				meta[3] = printof(n);
+				sfwrite(op, (char*)meta, 4);
+			} while (states[c = *++cp] == T_CNTL8BIT && raw);
+			break;
+		case T_EIGHTBIT:
+			do
+			{
+				meta[2] = c & ~0200;
+				sfwrite(op, (char*)meta, 3);
+			} while (states[c = *++cp] == T_EIGHTBIT && raw);
+			break;
+		case T_NEWLINE:
+			if (header && !(flags & B_FLAG))
+				sfprintf(op, "%6d\t", line);
+			if (flags & E_FLAG)
+				sfputc(op, '$');
+			sfputc(op, '\n');
+			if (!header || !(flags & B_FLAG))
+				line++;
+			header = !(flags & S_FLAG);
+			for (;;)
+			{
+				if ((n = states[*++cp]) == T_ENDBUF)
+				{
+					if (cp != end || last != '\n')
+						break;
+					if (!(nxt = (unsigned char*)(*reserve)(ip, SF_UNBOUND, 0)))
 					{
-						n = *cp++;
-						sfputc(fdout,'^');
-						sfputc(fdout,printof(n));
+						states[0] = sfvalue(ip) ? T_ERROR : T_EOF;
+						cp = end = tmp;
+						*cp-- = 0;
+						last = -1;
 					}
-					while ((n=states[*cp])==T_CONTROL);
-					break;
-				case T_NEWLINE:
-					lastline = line;
-					if (flags&S_FLAG)
+					else if ((n = sfvalue(ip)) <= 0)
 					{
-						while (states[*++cp]==T_NEWLINE)
-							line++;
-						cp--;
+						states[0] = n ? T_ERROR : T_EOF;
+						cp = end = tmp;
+						*cp-- = 0;
+						last = -1;
 					}
-					do
+					else
 					{
-						cp++;
-						if (flags&E_FLAG)
-							sfputc(fdout,'$');
-						sfputc(fdout,'\n');
-						if(line > lastline)
-						{
-							if (flags&E_FLAG)
-								sfputc(fdout,'$');
-							sfputc(fdout,'\n');
-						}
-						if (!(flags&(N_FLAG|B_FLAG)))
-							continue;
-						line++;
-						if (cp < endbuff)
-							sfprintf(fdout,"%6d\t",line);
-						else printdefer = 1;
+						buf = nxt;
+						end = buf + n - 1;
+						last = *end;
+						*end = 0;
+						cp = buf - 1;
 					}
-					while (states[*cp]==T_NEWLINE);
+				}
+				else if (n != T_NEWLINE)
 					break;
+				if (!(flags & S_FLAG) || any || header)
+				{
+					any = 0;
+					header = 0;
+					if ((flags & (B_FLAG|N_FLAG)) == N_FLAG)
+						sfprintf(op, "%6d\t", line);
+					if (flags & E_FLAG)
+						sfputc(op, '$');
+					sfputc(op, '\n');
+				}
+				if (!(flags & B_FLAG))
+					line++;
 			}
+			header = flags & (B_FLAG|N_FLAG);
+			break;
 		}
 	}
 }
@@ -239,60 +400,65 @@ b_cat(int argc, char** argv, void* context)
 	register char*		cp;
 	register Sfio_t*	fp;
 	char*			mode;
+	Reserve_f		reserve = sfreserve;
 	int			att;
-	int			dovcat=0;
+	int			dovcat = 0;
 	char			states[UCHAR_MAX+1];
 
-	NoP(argc);
 	cmdinit(argc, argv, context, ERROR_CATALOG, 0);
+	setlocale(LC_ALL, "");
 	att = !strcmp(astconf("UNIVERSE", NiL, NiL), "att");
 	mode = "r";
 	for (;;)
 	{
+		n = 0;
 		switch (optget(argv, usage))
 		{
 		case 'A':
-			flags |= T_FLAG|E_FLAG|V_FLAG;
-			continue;
+			n = T_FLAG|E_FLAG|V_FLAG;
+			break;
 		case 'B':
-			flags |= S_FLAG;
-			continue;
+			n = S_FLAG;
+			break;
 		case 'b':
-			flags |= B_FLAG;
+			n = B_FLAG;
+			break;
+		case 'd':
+			mode = opt_info.num ? "rt" : "r";
 			continue;
+		case 'D':
+			n = d_FLAG;
+			break;
 		case 'E':
-			flags |= E_FLAG;
-			continue;
+			n = E_FLAG;
+			break;
 		case 'e':
-			flags |= E_FLAG|V_FLAG;
-			continue;
+			n = E_FLAG|V_FLAG;
+			break;
 		case 'n':
-			flags |= N_FLAG;
+			n = N_FLAG;
+			break;
+		case 'R':
+			reserve = opt_info.num ? regress : sfreserve;
 			continue;
 		case 's':
-			flags |= att ? F_FLAG : S_FLAG;
-			continue;
+			n = att ? F_FLAG : S_FLAG;
+			break;
 		case 'S':
-			flags |= F_FLAG;
-			continue;
+			n = F_FLAG;
+			break;
 		case 'T':
-			flags |= T_FLAG;
-			continue;
+			n = T_FLAG;
+			break;
 		case 't':
-			flags |= T_FLAG|V_FLAG;
-			continue;
+			n = T_FLAG|V_FLAG;
+			break;
 		case 'u':
-			flags |= U_FLAG;
-			continue;
+			n = U_FLAG;
+			break;
 		case 'v':
-			flags |= V_FLAG;
-			continue;
-		case 'd':
-			mode = "rt";
-			continue;
-		case 'D':
-			flags |= d_FLAG;
-			continue;
+			n = V_FLAG;
+			break;
 		case ':':
 			error(2, "%s", opt_info.arg);
 			break;
@@ -300,7 +466,12 @@ b_cat(int argc, char** argv, void* context)
 			error(ERROR_usage(2), "%s", opt_info.arg);
 			break;
 		}
-		break;
+		if (!n)
+			break;
+		if (opt_info.num)
+			flags |= n;
+		else
+			flags &= ~n;
 	}
 	argv += opt_info.index;
 	if (error_info.errors)
@@ -340,15 +511,13 @@ b_cat(int argc, char** argv, void* context)
 		states['\n'] = T_NEWLINE;
 		dovcat = 1;
 	}
-	if (flags&B_FLAG)
-		flags |= S_FLAG;
 	if (flags&d_FLAG)
 		sfopen(sfstdout, NiL, "wt");
 	if (cp = *argv)
 		argv++;
 	do
 	{
-		if (!cp || streq(cp,"-"))
+		if (!cp || streq(cp, "-"))
 		{
 			fp = sfstdin;
 			if (flags&D_FLAG)
@@ -364,7 +533,7 @@ b_cat(int argc, char** argv, void* context)
 		if (flags&U_FLAG)
 			sfsetbuf(fp, (void*)fp, -1);
 		if (dovcat)
-			n = vcat(states, fp, sfstdout, flags);
+			n = vcat(states, fp, sfstdout, reserve, flags);
 		else if (sfmove(fp, sfstdout, SF_UNBOUND, -1) >= 0 && sfeof(fp))
 			n = 0;
 		else