922 SUNWdtrt needs some love

Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>

10 files changed, 19 insertions, 24 deletions

diff --git a/usr/src/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh b/usr/src/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh
index 561f8549d9..6ca9712736 100644
--- a/usr/src/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh
@@ -24,8 +24,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # This script primarily tests that the ::dtrace dcmd is not dumping
@@ -36,7 +34,7 @@
 
 script()
 {
-	$dtrace -o $dtraceout -s /dev/stdin <<EOF
+	exec $dtrace -o $dtraceout -s /dev/stdin <<EOF
 	syscall:::entry
 	{
 		@[probefunc] = count();
diff --git a/usr/src/cmd/dtrace/test/tst/common/misc/tst.include.ksh b/usr/src/cmd/dtrace/test/tst/common/misc/tst.include.ksh
index ec328021b3..17f12629f5 100644
--- a/usr/src/cmd/dtrace/test/tst/common/misc/tst.include.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/misc/tst.include.ksh
@@ -23,7 +23,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
@@ -83,13 +82,14 @@ files=/usr/include/sys/*.h
 # because they include static globals (!) or function bodies (!!) in the header
 # file.  Hopefully these remain sufficiently few that the O(#files * #badfiles)
 # algorithm, below, doesn't become a problem.  (And yes, writing scripts in
-# something other than ksh1888 would probably be a good idea.)  If this script
+# something other than ksh would probably be a good idea.)  If this script
 # becomes a problem, kindly fix it by reducing the number of bad files!  (That
 # is, fix it by fixing the broken file, not the broken script.)
 #
-badfiles="ctype.h eri_msg.h ser_sync.h sbpro.h neti.h hook_event.h \
+badfiles="ctype.h ser_sync.h neti.h hook_event.h \
     bootconf.h bootstat.h dtrace.h dumphdr.h exacct_impl.h fasttrap.h \
-    kobj.h kobj_impl.h ksyms.h lockstat.h smedia.h stat.h utsname.h"
+    kobj.h kobj_impl.h ksyms.h lockstat.h smedia.h stat.h utsname.h \
+    rds.h smbios_impl.h"
 
 for inc in $files; do
 	file=`basename $inc`
diff --git a/usr/src/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out b/usr/src/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
index 8a9ac6d96c..09d984d3fa 100644
--- a/usr/src/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
+++ b/usr/src/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out
@@ -4,12 +4,15 @@ read entry
 FUNCTION NAME
 read entry
 readlink entry
+readlinkat entry
 readv entry
 FUNCTION NAME
 read entry
 readlink entry
+readlinkat entry
 readv entry
 FUNCTION NAME
 readlink entry
+readlinkat entry
 FUNCTION NAME
 pread64 entry
diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
index 69c0f84a49..478307a11a 100644
--- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
@@ -23,7 +23,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 script()
 {
@@ -61,10 +60,9 @@ child=$!
 
 #
 # The only thing we can be sure of here is that we caught some function in
-# ksh doing work.  (This actually goes one step further and assumes that we
-# catch some non-static function in ksh.)
+# ksh doing work.
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep '(ksh|libshell\.so\.[0-9])`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child
diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
index 6ca823f5dd..b4b445056c 100644
--- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
@@ -23,7 +23,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 script()
 {
@@ -62,7 +61,7 @@ child=$!
 #
 # The only thing we can be sure of here is that ksh is doing some work.
 #
-script | tee /dev/fd/2 | grep -w ksh > /dev/null
+script | tee /dev/fd/2 | egrep -w '(ksh|libshell)' > /dev/null
 status=$? 
 
 kill $child
diff --git a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
index b1a3ab9de2..36edf0ed39 100644
--- a/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
@@ -23,7 +23,6 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 script()
 {
@@ -63,7 +62,7 @@ child=$!
 # This test is essentially the same as that in the ufunc test; see that
 # test for the rationale.
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep '(ksh|libshell\.so\.[0-9])`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child
diff --git a/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh b/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh
index 879774a42e..d701053b68 100644
--- a/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/safety/tst.violentdeath.ksh
@@ -23,11 +23,10 @@
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 script()
 {
-	$dtrace -x bufpolicy=ring -x bufsize=1k -s /dev/stdin <<EOF
+	exec $dtrace -x bufpolicy=ring -x bufsize=1k -s /dev/stdin <<EOF
 	fbt:::
 	{}
 EOF
diff --git a/usr/src/cmd/dtrace/test/tst/common/ustack/tst.spin.ksh b/usr/src/cmd/dtrace/test/tst/common/ustack/tst.spin.ksh
index 1a7e0e1236..57c13d5abe 100644
--- a/usr/src/cmd/dtrace/test/tst/common/ustack/tst.spin.ksh
+++ b/usr/src/cmd/dtrace/test/tst/common/ustack/tst.spin.ksh
@@ -23,7 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 if [ $# != 1 ]; then
 	echo expected one argument: '<'dtrace-path'>'
@@ -35,7 +34,7 @@ dtrace=$1
 
 rm -f $file
 
-dir=`dirname $tst`
+dir=`/bin/dirname $tst`
 
 $dtrace -o $file -c $dir/tst.spin.exe -s /dev/stdin <<EOF
 
diff --git a/usr/src/lib/libreparse/common/fs_reparse_lib.c b/usr/src/lib/libreparse/common/fs_reparse_lib.c
index b1ac809e63..3e395d5d7e 100644
--- a/usr/src/lib/libreparse/common/fs_reparse_lib.c
+++ b/usr/src/lib/libreparse/common/fs_reparse_lib.c
@@ -64,22 +64,22 @@ static int rp_plugin_inited = 0;
  * return 0 if ok else return error code.
  */
 int
-reparse_create(const char *path, const char *string)
+reparse_create(const char *path, const char *data)
 {
 	int err;
 	struct stat sbuf;
 
-	if (path == NULL || string == NULL)
+	if (path == NULL || data == NULL)
 		return (EINVAL);
 
-	if ((err = reparse_validate(string)) != 0)
+	if ((err = reparse_validate(data)) != 0)
 		return (err);
 
 	/* check if object exists */
 	if (lstat(path, &sbuf) == 0)
 		return (EEXIST);
 
-	return (symlink(string, path) ? errno : 0);
+	return (symlink(data, path) ? errno : 0);
 }
 
 /*
diff --git a/usr/src/uts/common/fs/fs_reparse.h b/usr/src/uts/common/fs/fs_reparse.h
index ec44484117..a3bb086a25 100644
--- a/usr/src/uts/common/fs/fs_reparse.h
+++ b/usr/src/uts/common/fs/fs_reparse.h
@@ -75,7 +75,7 @@ extern int reparse_add(nvlist_t *nvl, const char *svc_type,
 			const char *svc_data);
 extern int reparse_remove(nvlist_t *nvl, const char *svc_type);
 extern int reparse_unparse(nvlist_t *nvl, char **stringp);
-extern int reparse_create(const char *path, const char *string);
+extern int reparse_create(const char *path, const char *data);
 extern int reparse_delete(const char *path);
 extern int reparse_deref(const char *svc_type, const char *svc_data,
 			char *buf, size_t *bufsz);