From 557825f65166ad47f01c81eaf5a4ca54d3bd9d12 Mon Sep 17 00:00:00 2001
From: halex <>
Date: Mon, 4 Jul 2011 19:52:37 +0000
Subject: [PATCH] use "function X" rather than "X ()" since for the former,
 preceding parameter assignments function calls are not surprisingly polluting
 your shell environment

"makes sense" krw@, ok tedu@ guenther@
---
 src/etc/ksh.kshrc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/etc/ksh.kshrc b/src/etc/ksh.kshrc
index 10f30367..d836f513 100644
--- a/src/etc/ksh.kshrc
+++ b/src/etc/ksh.kshrc
@@ -1,5 +1,5 @@
 :
-#	$OpenBSD: ksh.kshrc,v 1.15 2010/04/26 09:04:15 otto Exp $
+#	$OpenBSD: ksh.kshrc,v 1.16 2011/07/04 19:52:37 halex Exp $
 #
 # NAME:
 #	ksh.kshrc - global initialization for ksh
@@ -92,15 +92,15 @@ case "$-" in
 	esac
 	# do we want window decorations?
 	if [ "$ILS" ]; then
-		ilabel () { print -n "${ILS}$*${ILE}">/dev/tty; }
-		label () { print -n "${WLS}$*${WLE}">/dev/tty; }
+		function ilabel { print -n "${ILS}$*${ILE}">/dev/tty; }
+		function label { print -n "${WLS}$*${WLE}">/dev/tty; }
 
 		alias stripe='label "$USER@$HOST ($tty) - $PWD"'
 		alias istripe='ilabel "$USER@$HOST ($tty)"'
 
-		wftp () { ilabel "ftp $*"; "ftp" "$@"; eval istripe; }
-		wcd () { \cd "$@" && eval stripe; }
-		wssh ()
+		function wftp { ilabel "ftp $*"; "ftp" "$@"; eval istripe; }
+		function wcd { \cd "$@" && eval stripe; }
+		function wssh
 		{
 			local rc
 			"ssh" "$@"
@@ -109,7 +109,7 @@ case "$-" in
 			eval stripe
 			return $rc
 		}
-		wtelnet ()
+		function wtelnet
 		{
 			local rc
 			"telnet" "$@"
@@ -118,7 +118,7 @@ case "$-" in
 			eval stripe
 			return $rc
 		}
-		wrlogin ()
+		function wrlogin
 		{
 			local rc
 			"rlogin" "$@"
@@ -127,7 +127,7 @@ case "$-" in
 			eval stripe
 			return $rc
 		}
-		wsu ()
+		function wsu
 		{
 			local rc
 			"su" "$@"
@@ -173,7 +173,7 @@ esac
 # commands for both interactive and non-interactive shells
 
 # is $1 missing from $2 (or PATH) ?
-no_path () {
+function no_path {
   eval _v="\$${2:-PATH}"
   case :$_v: in
   *:$1:*) return 1;;		# no we have it
@@ -181,15 +181,15 @@ no_path () {
   return 0
 }
 # if $1 exists and is not in path, append it
-add_path () {
+function add_path {
   [ -d ${1:-.} ] && no_path $* && eval ${2:-PATH}="\$${2:-PATH}:$1"
 }
 # if $1 exists and is not in path, prepend it
-pre_path () {
+function pre_path {
   [ -d ${1:-.} ] && no_path $* && eval ${2:-PATH}="$1:\$${2:-PATH}"
 }
 # if $1 is in path, remove it
-del_path () {
+function del_path {
   no_path $* || eval ${2:-PATH}=`eval echo :'$'${2:-PATH}: |
     sed -e "s;:$1:;:;g" -e "s;^:;;" -e "s;:\$;;"`
 }