From da2e3ebdc1edfbc5028edf1354e7dd2fa69a7968 Mon Sep 17 00:00:00 2001
From: chin <none@none>
Date: Fri, 17 Aug 2007 12:01:52 -0700
Subject: 6437624 RFE: Add ksh93 (as /usr/bin/ksh93) and libshell.so to OS/Net
 6505835 AST tools and library (libpp) required for creating l10n messages for
 ksh93 PSARC/2006/550 Korn Shell 93 Integration PSARC/2006/587 /etc/ksh.kshrc
 for ksh93 PSARC/2007/035 ksh93 Amendments Contributed by Roland Mainz
 <roland.mainz@nrubsig.org>

--HG--
rename : usr/src/lib/libcmd/common/mapfile-vers => deleted_files/usr/src/lib/libcmd/common/mapfile-vers
rename : usr/src/lib/libcmd/common/placeholder.c => deleted_files/usr/src/lib/libcmd/common/placeholder.c
---
 usr/src/cmd/nsadmin/Makefile  | 14 ++++++--------
 usr/src/cmd/nsadmin/ksh.kshrc | 42 ++++++++++++++++++++++++++++++++++++++++++
 usr/src/cmd/nsadmin/profile   | 13 ++++++++-----
 3 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 usr/src/cmd/nsadmin/ksh.kshrc

(limited to 'usr/src/cmd/nsadmin')

diff --git a/usr/src/cmd/nsadmin/Makefile b/usr/src/cmd/nsadmin/Makefile
index 5787f3a441..601d2dd963 100644
--- a/usr/src/cmd/nsadmin/Makefile
+++ b/usr/src/cmd/nsadmin/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1989, 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 
-PROG= profile .login system
+PROG= profile .login ksh.kshrc system
 PROGSKEL= local.login local.profile local.cshrc
 
 include ../Makefile.cmd
@@ -57,4 +56,3 @@ clobber:
 	$(RM) .login
 
 lint:
-
diff --git a/usr/src/cmd/nsadmin/ksh.kshrc b/usr/src/cmd/nsadmin/ksh.kshrc
new file mode 100644
index 0000000000..0622755de0
--- /dev/null
+++ b/usr/src/cmd/nsadmin/ksh.kshrc
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This file is sourced by interactive ksh93 shells before ${HOME}/.kshrc
+#
+
+# Enable "gmacs" editor mode if the user did not set an input mode yet
+# (for example via ${EDITOR}, ${VISUAL} or any "set -o" flag)
+if [[ "$(set +o)" != ~(E)--(gmacs|emacs|vi)( |$) ]] ; then
+    set -o gmacs
+fi
+
+
+# enable multiline input mode
+#set -o multiline
+
diff --git a/usr/src/cmd/nsadmin/profile b/usr/src/cmd/nsadmin/profile
index bff9862af4..09a024ceeb 100644
--- a/usr/src/cmd/nsadmin/profile
+++ b/usr/src/cmd/nsadmin/profile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,7 +18,11 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.3	*/
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+#ident	"%Z%%M%	%I%	%E% SMI"
 
 # The profile that all logins get before using their own .profile.
 
@@ -41,7 +44,7 @@ fi
 #	-rsh is given its environment in its .profile.
 
 case "$0" in
--sh | -ksh | -jsh | -bash)
+-sh | -ksh | -ksh93 | -jsh | -bash)
 
 	if [ ! -f .hushlogin ]
 	then
-- 
cgit v1.2.3