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, 112 insertions, 61 deletions

diff --git a/usr/src/lib/libshell/common/sh/path.c b/usr/src/lib/libshell/common/sh/path.c
index fc91fb34e4..94af2fe682 100644
--- a/usr/src/lib/libshell/common/sh/path.c
+++ b/usr/src/lib/libshell/common/sh/path.c
@@ -1,7 +1,7 @@
 /***********************************************************************
 *                                                                      *
 *               This software is part of the ast package               *
-*          Copyright (c) 1982-2008 AT&T Intellectual Property          *
+*          Copyright (c) 1982-2009 AT&T Intellectual Property          *
 *                      and is licensed under the                       *
 *                  Common Public License, Version 1.0                  *
 *                    by AT&T Intellectual Property                     *
@@ -57,6 +57,7 @@ static int		canexecute(char*,int);
 static void		funload(Shell_t*,int,const char*);
 static void		exscript(Shell_t*,char*, char*[], char**);
 static int		path_chkpaths(Pathcomp_t*,Pathcomp_t*,Pathcomp_t*,int);
+static void		path_checkdup(register Pathcomp_t*);
 
 static const char	*std_path;
 
@@ -352,6 +353,7 @@ static char *path_lib(Pathcomp_t *pp, char *path)
 		char save[8];
 		for( ;pp; pp=pp->next)
 		{
+			path_checkdup(pp);
 			if(pp->ino==statb.st_ino && pp->dev==statb.st_dev && pp->mtime==statb.st_mtime)
 				return(pp->lib);
 		}
@@ -380,19 +382,63 @@ void path_dump(register Pathcomp_t *pp)
 #endif
 
 /*
+ * check for duplicate directories on PATH
+ */
+static void path_checkdup(register Pathcomp_t *pp)
+{
+	register char		*name = pp->name;
+	register Pathcomp_t	*oldpp,*first;
+	register int		flag=0;
+	struct stat 		statb;
+	if(stat(name,&statb)<0 || !S_ISDIR(statb.st_mode))
+	{
+		pp->flags |= PATH_SKIP;
+		pp->dev = *name=='/';
+		return;
+	}
+	pp->mtime = statb.st_mtime;
+	pp->ino = statb.st_ino;
+	pp->dev = statb.st_dev;
+	if(*name=='/' && onstdpath(name))
+		flag = PATH_STD_DIR;
+	first = (pp->flags&PATH_CDPATH)?pp->shp->cdpathlist:path_get("");
+	for(oldpp=first; oldpp && oldpp!=pp; oldpp=oldpp->next)
+	{
+		if(pp->ino==oldpp->ino && pp->dev==oldpp->dev && pp->mtime==oldpp->mtime)
+		{
+			flag |= PATH_SKIP;
+			break;
+		}
+	}
+	pp->flags |= flag;
+	if(((pp->flags&(PATH_PATH|PATH_SKIP))==PATH_PATH))
+	{
+		int offset = staktell();
+		stakputs(name);
+		path_chkpaths(first,0,pp,offset);
+		stakseek(offset);
+	}
+}
+
+/*
  * write the next path to search on the current stack
  * if last is given, all paths that come before <last> are skipped
  * the next pathcomp is returned.
  */
 Pathcomp_t *path_nextcomp(register Pathcomp_t *pp, const char *name, Pathcomp_t *last)
 {
+	Pathcomp_t	*ppnext;
 	stakseek(PATH_OFFSET);
 	if(*name=='/')
 		pp = 0;
 	else
 	{
-		for(;pp && pp!=last;pp=pp->next)
+		for(;pp && pp!=last;pp=ppnext)
 		{
+			if(ppnext=pp->next)
+				ppnext->shp = pp->shp;
+			if(!pp->dev && !pp->ino)
+				path_checkdup(pp);
 			if(pp->flags&PATH_SKIP)
 				continue;
 			if(!last || *pp->name!='/')
@@ -523,6 +569,13 @@ static int	path_opentype(const char *name, register Pathcomp_t *pp, int fun)
 	if(fd>=0 && (fd = sh_iomovefd(fd)) > 0)
 	{
 		fcntl(fd,F_SETFD,FD_CLOEXEC);
+		if(!shp)
+		{
+			shp = sh_getinterp();
+#if _UWIN
+			close(0x10001); /* this results in a /var/log/uwin message with "0x10001" for debugging */
+#endif
+		}
 		shp->fdstatus[fd] |= IOCLEX;
 	}
 	return(fd);
@@ -581,16 +634,17 @@ static void funload(Shell_t *shp,int fno, const char *name)
 	pname = path_fullname(stakptr(PATH_OFFSET));
 	if(shp->fpathdict && (rp = dtmatch(shp->fpathdict,(void*)pname)))
 	{
+		Dt_t	*funtree = sh_subfuntree(1);
 		do
 		{
-			if((np = dtsearch(shp->fun_tree,rp->np)) && is_afunction(np))
+			if((np = dtsearch(funtree,rp->np)) && is_afunction(np))
 			{
 				if(np->nvalue.rp)
 					np->nvalue.rp->fdict = 0;
-				nv_delete(np,shp->fun_tree,NV_NOFREE);
+				nv_delete(np,funtree,NV_NOFREE);
 			}
-			dtinsert(shp->fun_tree,rp->np);
-			rp->fdict = shp->fun_tree;
+			dtinsert(funtree,rp->np);
+			rp->fdict = funtree;
 		}
 		while((rp=dtnext(shp->fpathdict,rp)) && strcmp(pname,rp->fname)==0);
 		return;
@@ -601,7 +655,7 @@ static void funload(Shell_t *shp,int fno, const char *name)
 	shp->st.filename = pname;
 	shp->funload = 1;
 	error_info.line = 0;
-	sh_eval(sfnew(NIL(Sfio_t*),buff,IOBSIZE,fno,SF_READ),0);
+	sh_eval(sfnew(NIL(Sfio_t*),buff,IOBSIZE,fno,SF_READ),SH_FUNEVAL);
 	shp->readscript = 0;
 	free((void*)shp->st.filename);
 	shp->funload = oldload;
@@ -652,10 +706,17 @@ int	path_search(register const char *name,Pathcomp_t **oldpp, int flag)
 		path_init(shp);
 	if(flag)
 	{
+		if((np=nv_search(name,shp->track_tree,0)) && !nv_isattr(np,NV_NOALIAS) && (pp=(Pathcomp_t*)np->nvalue.cp))
+		{
+			stakseek(PATH_OFFSET);
+			path_nextcomp(pp,name,pp);
+			stakputc(0);
+			return(0);
+		}
 		pp = path_absolute(name,oldpp?*oldpp:NIL(Pathcomp_t*));
 		if(oldpp)
 			*oldpp = pp;
-		if(!pp && (np=nv_search(name,sh.fun_tree,HASH_NOSCOPE))&&np->nvalue.ip)
+		if(!pp && (np=nv_search(name,shp->fun_tree,HASH_NOSCOPE))&&np->nvalue.ip)
 			return(1);
 		if(!pp)
 			*stakptr(PATH_OFFSET) = 0;
@@ -685,11 +746,9 @@ int	path_search(register const char *name,Pathcomp_t **oldpp, int flag)
 	return(0);
 }
 
-
 /*
  * do a path search and find the full pathname of file name
  */
-
 Pathcomp_t *path_absolute(register const char *name, Pathcomp_t *pp)
 {
 	register int	f,isfun;
@@ -706,7 +765,18 @@ Pathcomp_t *path_absolute(register const char *name, Pathcomp_t *pp)
 		sh_sigcheck();
 		isfun = (pp->flags&PATH_FPATH);
 		if(oldpp=pp)
+		{
 			pp = path_nextcomp(pp,name,0);
+			while(oldpp->flags&PATH_SKIP)
+			{
+				if(!(oldpp=oldpp->next))
+				{
+					shp->path_err = ENOENT;
+					return(0);
+				}
+			}
+		}
+			
 		if(!isfun && !sh_isoption(SH_RESTRICTED))
 		{
 			if(*stakptr(PATH_OFFSET)=='/' && nv_search(stakptr(PATH_OFFSET),sh.bltin_tree,0))
@@ -717,6 +787,7 @@ Pathcomp_t *path_absolute(register const char *name, Pathcomp_t *pp)
 				typedef int (*Fptr_t)(int, char*[], void*);
 				Fptr_t addr;
 				int n = staktell();
+				int libcmd;
 				char *cp;
 				stakputs("b_");
 				stakputs(name);
@@ -727,7 +798,7 @@ Pathcomp_t *path_absolute(register const char *name, Pathcomp_t *pp)
 						cp++;
 					else
 						cp = oldpp->blib;
-					if(strcmp(cp,LIBCMD)==0 && (addr=(Fptr_t)dlllook((void*)0,stakptr(n))))
+					if((libcmd = !strcmp(cp,LIBCMD)) && (addr=(Fptr_t)dlllook((void*)0,stakptr(n))))
 					{
 						if((np = sh_addbuiltin(stakptr(PATH_OFFSET),addr,NiL)) && nv_isattr(np,NV_BLTINOPT))
 							return(oldpp);
@@ -737,7 +808,21 @@ Pathcomp_t *path_absolute(register const char *name, Pathcomp_t *pp)
 #else
 					if (oldpp->bltin_lib = dllfind(oldpp->blib, NiL, RTLD_LAZY, NiL, 0))
 #endif
-						sh_addlib(oldpp->bltin_lib);
+					{
+						/*
+						 * this detects the 2007-05-11 builtin context change and also
+						 * the 2008-03-30 opt_info.num change that hit libcmd::b_head
+						 */
+
+						if (libcmd && !dlllook(oldpp->bltin_lib, "b_pids"))
+						{
+							dlclose(oldpp->bltin_lib);
+							oldpp->bltin_lib = 0;
+							oldpp->blib = 0;
+						}
+						else
+							sh_addlib(oldpp->bltin_lib);
+					}
 				}
 				if((addr=(Fptr_t)dlllook(oldpp->bltin_lib,stakptr(n))) &&
 				   (!(np = sh_addbuiltin(stakptr(PATH_OFFSET),NiL,NiL)) || np->nvalue.bfp!=addr) &&
@@ -753,7 +838,8 @@ Pathcomp_t *path_absolute(register const char *name, Pathcomp_t *pp)
 		f = canexecute(stakptr(PATH_OFFSET),isfun);
 		if(isfun && f>=0)
 		{
-			nv_onattr(nv_open(name,shp->fun_tree,NV_NOARRAY|NV_IDENT|NV_NOSCOPE),NV_LTOU|NV_FUNCTION);
+			nv_onattr(nv_open(name,sh_subfuntree(1),NV_NOARRAY|NV_IDENT|NV_NOSCOPE),NV_LTOU|NV_FUNCTION);
+			funload(shp,f,name);
 			close(f);
 			f = -1;
 			return(0);
@@ -881,7 +967,7 @@ void	path_exec(register const char *arg0,register char *argv[],struct argnod *lo
 	Pathcomp_t *libpath, *pp=0;
 	Shell_t *shp = &sh;
 	int slash=0;
-	nv_setlist(local,NV_EXPORT|NV_IDENT|NV_ASSIGN);
+	nv_setlist(local,NV_EXPORT|NV_IDENT|NV_ASSIGN,0);
 	envp = sh_envgen();
 	if(strchr(arg0,'/'))
 	{
@@ -896,6 +982,8 @@ void	path_exec(register const char *arg0,register char *argv[],struct argnod *lo
 	sfsync(NIL(Sfio_t*));
 	timerdel(NIL(void*));
 	/* find first path that has a library component */
+	while(pp && (pp->flags&PATH_SKIP))
+		pp = pp->next;
 	if(pp || slash) do
 	{
 		sh_sigcheck();
@@ -926,15 +1014,16 @@ pid_t path_spawn(const char *opath,register char **argv, char **envp, Pathcomp_t
 	char **xp=0, *xval, *libenv = (libpath?libpath->lib:0); 
 	Namval_t*	np;
 	char		*s, *v;
-	int		r, n;
+	int		r, n, pidsize;
 	pid_t		pid= -1;
 	/* leave room for inserting _= pathname in environment */
 	envp--;
 #if _lib_readlink
 	/* save original pathname */
 	stakseek(PATH_OFFSET);
+	pidsize = sfprintf(stkstd,"*%d*",spawn?getpid():getppid());
 	stakputs(opath);
-	opath = stakfreeze(1)+PATH_OFFSET;
+	opath = stakfreeze(1)+PATH_OFFSET+pidsize;
 	np=nv_search(argv[0],shp->track_tree,0);
 	while(libpath && !libpath->lib)
 		libpath=libpath->next;
@@ -1012,7 +1101,7 @@ pid_t path_spawn(const char *opath,register char **argv, char **envp, Pathcomp_t
 	}
 	if(!opath)
 		opath = stakptr(PATH_OFFSET);
-	envp[0] =  (char*)opath-PATH_OFFSET;
+	envp[0] =  (char*)opath-(PATH_OFFSET+pidsize);
 	envp[0][0] =  '_';
 	envp[0][1] =  '=';
 	sfsync(sfstderr);
@@ -1219,6 +1308,8 @@ static void exscript(Shell_t *shp,register char *path,register char *argv[],char
 		(HISTCUR)->nvalue.lp = 0;
 	}
 	sh_offstate(SH_FORKED);
+	if(shp->sigflag[SIGCHLD]==SH_SIGOFF)
+		shp->sigflag[SIGCHLD] = SH_SIGFAULT;
 	siglongjmp(*shp->jmplist,SH_JMPSCRIPT);
 }
 
@@ -1322,7 +1413,6 @@ static void exscript(Shell_t *shp,register char *path,register char *argv[],char
 static Pathcomp_t *path_addcomp(Pathcomp_t *first, Pathcomp_t *old,const char *name, int flag)
 {
 	register Pathcomp_t *pp, *oldpp;
-	struct stat statb;
 	int len, offset=staktell();
 	if(!(flag&PATH_BFPATH))
 	{
@@ -1344,65 +1434,26 @@ static Pathcomp_t *path_addcomp(Pathcomp_t *first, Pathcomp_t *old,const char *n
 			return(first);
 		}
 	}
-	if(old && (old=path_dirfind(old,name,0)))
-	{
-		statb.st_ino = old->ino;
-		statb.st_dev = old->dev;
-		statb.st_mtime = old->mtime;
-		if(old->ino==0 && old->dev==0)
-			flag |= PATH_SKIP;
-	}
-	else if(stat(name,&statb)<0 || !S_ISDIR(statb.st_mode))
-	{
-		if(*name=='/')
-		{
-			if(strcmp(name,SH_CMDLIB_DIR))
-				return(first);
-			statb.st_dev = 1;
-		}
-		else
-		{
-			flag |= PATH_SKIP;
-			statb.st_dev = 0;
-		}
-		statb.st_ino = 0;
-		statb.st_mtime = 0;
-	}
-	if(*name=='/' && onstdpath(name))
-		flag |= PATH_STD_DIR;
-	for(pp=first, oldpp=0; pp; oldpp=pp, pp=pp->next)
-	{
-		if(pp->ino==statb.st_ino && pp->dev==statb.st_dev && pp->mtime==statb.st_mtime)
-		{
-			/* if both absolute paths, eliminate second */
-			pp->flags |= flag;
-			if(*name=='/' && *pp->name=='/')
-				return(first);
-			/* keep the path but mark it as skip */
-			flag |= PATH_SKIP;
-		}
-	}
+	for(pp=first, oldpp=0; pp; oldpp=pp, pp=pp->next);
 	pp = newof((Pathcomp_t*)0,Pathcomp_t,1,len+1);
 	pp->refcount = 1;
 	memcpy((char*)(pp+1),name,len+1);
 	pp->name = (char*)(pp+1);
 	pp->len = len;
-	pp->dev = statb.st_dev;
-	pp->ino = statb.st_ino;
-	pp->mtime = statb.st_mtime;
 	if(oldpp)
 		oldpp->next = pp;
 	else
 		first = pp;
 	pp->flags = flag;
-	if(pp->ino==0 && pp->dev==1)
+	if(strcmp(name,SH_CMDLIB_DIR)==0)
 	{
+		pp->dev = 1;
 		pp->flags |= PATH_BUILTIN_LIB;
 		pp->blib = malloc(4);
 		strcpy(pp->blib,LIBCMD);
 		return(first);
 	}
-	if((flag&(PATH_PATH|PATH_SKIP))==PATH_PATH)
+	if(old && ((flag&(PATH_PATH|PATH_SKIP))==PATH_PATH))
 		path_chkpaths(first,old,pp,offset);
 	return(first);
 }