From 5195be912eb257c05a0c97e561e72f01af2583ff Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 1 Sep 1996 10:22:36 +0000
Subject: Merge of 4.4-Lite2 sh source, plus some gcc -Wall cleaning.  This is
 a merge of parallel duplicate work by Steve Price and myself. :-]

There are some changes to the build that are my fault...  mkinit.c was
trying (poorly) to duplicate some of the work that make(1) is designed to
do.  The Makefile hackery is my fault too, the depend list was incomplete
because of some explicit OBJS+= entries, so mkdep wasn't picking up their
source file #includes.

This closes a pile of /bin/sh PR's, but not all of them..

Submitted by: Steve Price <steve@bonsai.hiwaay.net>, peter
---
 bin/sh/funcs/cmv     | 4 ++--
 bin/sh/funcs/dirs    | 4 ++--
 bin/sh/funcs/kill    | 4 ++--
 bin/sh/funcs/login   | 4 ++--
 bin/sh/funcs/newgrp  | 4 ++--
 bin/sh/funcs/popd    | 4 ++--
 bin/sh/funcs/pushd   | 4 ++--
 bin/sh/funcs/suspend | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'bin/sh/funcs')

diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index cacb5ba..f988753 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)cmv	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)cmv	8.2 (Berkeley) 5/4/95
+#	$Id: cmv,v 1.2 1994/09/24 02:58:33 davidg Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index fe70c68..e9146d3 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)dirs	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)dirs	8.2 (Berkeley) 5/4/95
+#	$Id: dirs,v 1.2 1994/09/24 02:58:34 davidg Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index f3489b5..4de6d8f 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)kill	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)kill	8.2 (Berkeley) 5/4/95
+#	$Id: kill,v 1.2 1994/09/24 02:58:36 davidg Exp $
 
 # Convert job names to process ids and then run /bin/kill.
 
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index f44d3a5..52f41f1 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)login	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)login	8.2 (Berkeley) 5/4/95
+#	$Id: login,v 1.2 1994/09/24 02:58:38 davidg Exp $
 
 # replaces the login builtin in the BSD shell
 login () exec login "$@"
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index fc02baa..ba538fa 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)newgrp	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)newgrp	8.2 (Berkeley) 5/4/95
+#	$Id: newgrp,v 1.2 1994/09/24 02:58:40 davidg Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index 938aabc..f39a710 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)popd	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)popd	8.2 (Berkeley) 5/4/95
+#	$Id: popd,v 1.2 1994/09/24 02:58:41 davidg Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index 879ae20..a823713 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)pushd	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)pushd	8.2 (Berkeley) 5/4/95
+#	$Id: pushd,v 1.2 1994/09/24 02:58:43 davidg Exp $
 
 # pushd, popd, and dirs --- written by Chris Bertin
 # Pixel Computer Inc. ...!wjh12!pixel!pixutl!chris
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index 3a0735c..e68564e 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -32,8 +32,8 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	@(#)suspend	8.1 (Berkeley) 5/31/93
-#	$Id$
+#	@(#)suspend	8.2 (Berkeley) 5/4/95
+#	$Id: suspend,v 1.2 1994/09/24 02:58:44 davidg Exp $
 
 suspend() {
 	local -
-- 
cgit v1.1