summaryrefslogtreecommitdiff
path: root/bin/sh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/sh')
-rw-r--r--bin/sh/Makefile2
-rw-r--r--bin/sh/TOUR2
-rw-r--r--bin/sh/alias.c2
-rw-r--r--bin/sh/alias.h2
-rw-r--r--bin/sh/arith.h2
-rw-r--r--bin/sh/arith.y2
-rw-r--r--bin/sh/arith_lex.l2
-rw-r--r--bin/sh/bltin/bltin.h2
-rw-r--r--bin/sh/bltin/echo.12
-rw-r--r--bin/sh/bltin/echo.c2
-rw-r--r--bin/sh/builtins.def2
-rw-r--r--bin/sh/cd.c2
-rw-r--r--bin/sh/cd.h2
-rw-r--r--bin/sh/error.c2
-rw-r--r--bin/sh/error.h2
-rw-r--r--bin/sh/eval.c2
-rw-r--r--bin/sh/eval.h2
-rw-r--r--bin/sh/exec.c2
-rw-r--r--bin/sh/exec.h2
-rw-r--r--bin/sh/expand.c2
-rw-r--r--bin/sh/expand.h2
-rw-r--r--bin/sh/funcs/cmv2
-rw-r--r--bin/sh/funcs/dirs2
-rw-r--r--bin/sh/funcs/kill2
-rw-r--r--bin/sh/funcs/login2
-rw-r--r--bin/sh/funcs/newgrp2
-rw-r--r--bin/sh/funcs/popd2
-rw-r--r--bin/sh/funcs/pushd2
-rw-r--r--bin/sh/funcs/suspend2
-rw-r--r--bin/sh/histedit.c2
-rw-r--r--bin/sh/init.h2
-rw-r--r--bin/sh/input.c2
-rw-r--r--bin/sh/input.h2
-rw-r--r--bin/sh/jobs.c2
-rw-r--r--bin/sh/jobs.h2
-rw-r--r--bin/sh/machdep.h2
-rw-r--r--bin/sh/mail.c2
-rw-r--r--bin/sh/mail.h2
-rw-r--r--bin/sh/main.c2
-rw-r--r--bin/sh/main.h2
-rw-r--r--bin/sh/memalloc.c2
-rw-r--r--bin/sh/memalloc.h2
-rw-r--r--bin/sh/miscbltin.c2
-rwxr-xr-xbin/sh/mkbuiltins2
-rw-r--r--bin/sh/mkinit.c2
-rw-r--r--bin/sh/mknodes.c2
-rw-r--r--bin/sh/mksyntax.c2
-rw-r--r--bin/sh/mktokens2
-rw-r--r--bin/sh/myhistedit.h2
-rw-r--r--bin/sh/mystring.c2
-rw-r--r--bin/sh/mystring.h2
-rw-r--r--bin/sh/nodes.c.pat2
-rw-r--r--bin/sh/nodetypes2
-rw-r--r--bin/sh/options.c2
-rw-r--r--bin/sh/options.h2
-rw-r--r--bin/sh/output.c2
-rw-r--r--bin/sh/output.h2
-rw-r--r--bin/sh/parser.c2
-rw-r--r--bin/sh/parser.h2
-rw-r--r--bin/sh/redir.c2
-rw-r--r--bin/sh/redir.h2
-rw-r--r--bin/sh/sh.12
-rw-r--r--bin/sh/shell.h2
-rw-r--r--bin/sh/show.c2
-rw-r--r--bin/sh/show.h2
-rw-r--r--bin/sh/trap.c2
-rw-r--r--bin/sh/trap.h2
-rw-r--r--bin/sh/var.c2
-rw-r--r--bin/sh/var.h2
69 files changed, 69 insertions, 69 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index be4b5daa3fe2..bb26976399c3 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 8.4 (Berkeley) 5/5/95
-# $Id: Makefile,v 1.15.2.2 1997/08/25 21:16:13 jkh Exp $
+# $Id: Makefile,v 1.15.2.3 1997/10/26 22:46:55 jkh Exp $
PROG= sh
SHSRCS= alias.c cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index 44e84901780a..0adb2a0c2912 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
# @(#)TOUR 8.1 (Berkeley) 5/31/93
-# $Id: TOUR,v 1.2 1994/09/24 02:57:19 davidg Exp $
+# $Id: TOUR,v 1.3 1996/09/01 10:19:22 peter Exp $
NOTE -- This is the original TOUR paper distributed with ash and
does not represent the current state of the shell. It is provided anyway
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index 410f65aac422..ff54df8a5e8a 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: alias.c,v 1.4 1996/09/01 10:19:26 peter Exp $
+ * $Id: alias.c,v 1.4.2.1 1997/08/25 09:09:30 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index 7abaccf7ba9b..fae125ce5d1b 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)alias.h 8.2 (Berkeley) 5/4/95
- * $Id: alias.h,v 1.2 1994/09/24 02:57:20 davidg Exp $
+ * $Id: alias.h,v 1.3 1996/09/01 10:19:29 peter Exp $
*/
#define ALIASINUSE 1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index 34eb73c19251..8fa530832966 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)arith.h 1.1 (Berkeley) 5/4/95
- * $Id$
+ * $Id: arith.h,v 1.2 1996/09/01 10:19:35 peter Exp $
*/
int arith __P((char *));
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index fe04ff18ce92..a58575c0fd1f 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -88,7 +88,7 @@ expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: arith.y,v 1.3 1996/09/01 10:19:38 peter Exp $
+ * $Id: arith.y,v 1.3.2.1 1997/08/25 09:09:32 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 62f3ff5c98e2..3b4f57cfe668 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: arith_lex.l,v 1.5 1996/09/01 10:19:41 peter Exp $
+ * $Id: arith_lex.l,v 1.5.2.1 1997/08/25 09:09:34 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index ff79458ccd8b..34fabf1df4e9 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)bltin.h 8.2 (Berkeley) 5/4/95
- * $Id: bltin.h,v 1.5 1996/09/01 10:22:13 peter Exp $
+ * $Id: bltin.h,v 1.5.2.1 1997/08/25 09:10:59 jkh Exp $
*/
/*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index c5a1b424f253..21718d030336 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)echo.1 8.2 (Berkeley) 5/4/95
-.\" $Id: echo.1,v 1.3 1996/09/01 10:22:15 peter Exp $
+.\" $Id: echo.1,v 1.4 1996/09/03 14:16:06 peter Exp $
.\"
.Dd May 4, 1995
.Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 6e6b7dfaf903..b06d799c8128 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)echo.c 8.2 (Berkeley) 5/4/95
- * $Id: echo.c,v 1.4 1996/09/01 10:22:16 peter Exp $
+ * $Id: echo.c,v 1.4.2.1 1997/08/25 09:11:00 jkh Exp $
*/
/*
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index cd3aa717132d..2dba3ae645f7 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -35,7 +35,7 @@
# SUCH DAMAGE.
#
# @(#)builtins.def 8.4 (Berkeley) 5/4/95
-# $Id: builtins.def,v 1.3 1996/10/01 04:59:13 peter Exp $
+# $Id: builtins.def,v 1.3.2.1 1997/08/25 09:09:35 jkh Exp $
#
# This file lists all the builtin commands. The first column is the name
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 6baba5a5c260..a5220464b7dc 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: cd.c,v 1.6 1996/09/01 10:19:47 peter Exp $
+ * $Id: cd.c,v 1.6.2.1 1997/08/25 09:09:37 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index feb6d8156e41..7396d8c06aed 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id$
+ * $Id: cd.h,v 1.2.2.1 1998/02/15 11:32:24 jkh Exp $
*/
char *getpwd __P((void));
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 0cd3b1cce008..6cfcf85aca14 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: error.c,v 1.5 1996/09/03 14:15:46 peter Exp $
+ * $Id: error.c,v 1.5.2.1 1997/08/25 09:09:38 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 767ba66076f6..5ad1b2f864b3 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)error.h 8.2 (Berkeley) 5/4/95
- * $Id: error.h,v 1.4 1996/09/03 14:15:48 peter Exp $
+ * $Id: error.h,v 1.4.2.1 1997/08/25 09:09:40 jkh Exp $
*/
/*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index f0e37337cc42..ec871ad5b351 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: eval.c,v 1.7.2.3 1997/08/25 09:09:42 jkh Exp $
+ * $Id: eval.c,v 1.7.2.4 1998/05/04 07:25:58 cracauer Exp $
*/
#ifndef lint
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index ceaef6db351e..599483a6aca2 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)eval.h 8.2 (Berkeley) 5/4/95
- * $Id: eval.h,v 1.3 1996/09/01 10:19:59 peter Exp $
+ * $Id: eval.h,v 1.3.2.1 1997/08/25 09:09:44 jkh Exp $
*/
extern char *commandname; /* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 4475ee3de99e..89fea86efabe 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: exec.c,v 1.6 1996/09/03 14:15:49 peter Exp $
+ * $Id: exec.c,v 1.6.2.1 1997/08/25 09:09:46 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index 5d3419036356..63bb49f25272 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)exec.h 8.3 (Berkeley) 6/8/95
- * $Id: exec.h,v 1.3 1996/09/01 10:20:05 peter Exp $
+ * $Id: exec.h,v 1.3.2.1 1997/08/25 09:09:49 jkh Exp $
*/
/* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 2344b3b220e8..aa4f3c34f403 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: expand.c,v 1.11.2.4 1997/06/19 17:57:30 jkh Exp $
+ * $Id: expand.c,v 1.11.2.5 1997/08/25 09:09:51 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 4d621a356711..2296cfa140e6 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)expand.h 8.2 (Berkeley) 5/4/95
- * $Id: expand.h,v 1.2 1994/09/24 02:57:35 davidg Exp $
+ * $Id: expand.h,v 1.3 1996/09/01 10:20:10 peter Exp $
*/
struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index f988753e3004..669a9e243e94 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)cmv 8.2 (Berkeley) 5/4/95
-# $Id: cmv,v 1.2 1994/09/24 02:58:33 davidg Exp $
+# $Id: cmv,v 1.3 1996/09/01 10:22:21 peter Exp $
# Conditional move--don't replace an existing file.
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index e9146d33f45f..328281432bb1 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)dirs 8.2 (Berkeley) 5/4/95
-# $Id: dirs,v 1.2 1994/09/24 02:58:34 davidg Exp $
+# $Id: dirs,v 1.3 1996/09/01 10:22:23 peter 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 4de6d8f2f265..6bcaa5eae755 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)kill 8.2 (Berkeley) 5/4/95
-# $Id: kill,v 1.2 1994/09/24 02:58:36 davidg Exp $
+# $Id: kill,v 1.3 1996/09/01 10:22:25 peter 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 52f41f1cf351..7af85fc18da0 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)login 8.2 (Berkeley) 5/4/95
-# $Id: login,v 1.2 1994/09/24 02:58:38 davidg Exp $
+# $Id: login,v 1.3 1996/09/01 10:22:27 peter 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 ba538fa41bd4..1a5bbfe42ddc 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -33,6 +33,6 @@
# SUCH DAMAGE.
#
# @(#)newgrp 8.2 (Berkeley) 5/4/95
-# $Id: newgrp,v 1.2 1994/09/24 02:58:40 davidg Exp $
+# $Id: newgrp,v 1.3 1996/09/01 10:22:29 peter Exp $
newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index f39a7103ab68..1bb422930909 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)popd 8.2 (Berkeley) 5/4/95
-# $Id: popd,v 1.2 1994/09/24 02:58:41 davidg Exp $
+# $Id: popd,v 1.3 1996/09/01 10:22:32 peter 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 a82371322202..856e3c8367a8 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)pushd 8.2 (Berkeley) 5/4/95
-# $Id: pushd,v 1.2 1994/09/24 02:58:43 davidg Exp $
+# $Id: pushd,v 1.3 1996/09/01 10:22:34 peter 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 e68564efb11f..6c12eb8ba699 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -33,7 +33,7 @@
# SUCH DAMAGE.
#
# @(#)suspend 8.2 (Berkeley) 5/4/95
-# $Id: suspend,v 1.2 1994/09/24 02:58:44 davidg Exp $
+# $Id: suspend,v 1.3 1996/09/01 10:22:36 peter Exp $
suspend() {
local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index d895f580335f..cd9fbedb48f7 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: histedit.c,v 1.6 1996/09/03 13:35:09 peter Exp $
+ * $Id: histedit.c,v 1.6.2.1 1997/08/25 09:09:54 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/init.h b/bin/sh/init.h
index eff47ef7893b..a84d684f734c 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)init.h 8.2 (Berkeley) 5/4/95
- * $Id: init.h,v 1.2 1994/09/24 02:57:37 davidg Exp $
+ * $Id: init.h,v 1.3 1996/09/01 10:20:15 peter Exp $
*/
void init __P((void));
diff --git a/bin/sh/input.c b/bin/sh/input.c
index cb3db548e91e..1e2dcc96ccd4 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: input.c,v 1.6 1996/09/03 14:15:50 peter Exp $
+ * $Id: input.c,v 1.6.2.1 1997/08/25 09:09:57 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/input.h b/bin/sh/input.h
index e2d257133ca5..67514b5fee4a 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)input.h 8.2 (Berkeley) 5/4/95
- * $Id: input.h,v 1.3 1996/09/01 10:20:21 peter Exp $
+ * $Id: input.h,v 1.3.2.1 1997/08/25 09:09:58 jkh Exp $
*/
/* PEOF (the end of file marker) is defined in syntax.h */
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index cc4649e474b2..0ff5cd2490ce 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: jobs.c,v 1.8.2.3 1997/08/25 09:10:00 jkh Exp $
+ * $Id: jobs.c,v 1.8.2.4 1998/02/15 11:32:25 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 429a7116d061..92590bfe50fb 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)jobs.h 8.2 (Berkeley) 5/4/95
- * $Id: jobs.h,v 1.3 1996/09/01 10:20:27 peter Exp $
+ * $Id: jobs.h,v 1.3.2.1 1997/08/25 09:10:02 jkh Exp $
*/
/* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h
index 2f2aea045095..767939f3da5d 100644
--- a/bin/sh/machdep.h
+++ b/bin/sh/machdep.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)machdep.h 8.2 (Berkeley) 5/4/95
- * $Id: machdep.h,v 1.2 1994/09/24 02:57:43 davidg Exp $
+ * $Id: machdep.h,v 1.3 1996/09/01 10:20:32 peter Exp $
*/
/*
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 8c2d3a968aa7..3f33a15ee602 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mail.c,v 1.3 1996/09/01 10:20:35 peter Exp $
+ * $Id: mail.c,v 1.3.2.1 1997/08/25 09:10:05 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index 644d8087106c..84991f4f3a2c 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)mail.h 8.2 (Berkeley) 5/4/95
- * $Id: mail.h,v 1.2 1994/09/24 02:57:45 davidg Exp $
+ * $Id: mail.h,v 1.3 1996/09/01 10:20:37 peter Exp $
*/
void chkmail __P((int));
diff --git a/bin/sh/main.c b/bin/sh/main.c
index df604006e57a..20452f7dad23 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: main.c,v 1.9.2.1 1997/08/03 18:44:27 steve Exp $
+ * $Id: main.c,v 1.9.2.2 1997/08/25 09:10:07 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/main.h b/bin/sh/main.h
index 611f00ad2e2e..f651723996f6 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)main.h 8.2 (Berkeley) 5/4/95
- * $Id: main.h,v 1.2 1994/09/24 02:57:49 davidg Exp $
+ * $Id: main.h,v 1.3 1996/09/01 10:20:40 peter Exp $
*/
extern int rootpid; /* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 9e49b9d11027..ff227def3337 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: memalloc.c,v 1.4 1996/09/03 14:15:53 peter Exp $
+ * $Id: memalloc.c,v 1.4.2.1 1997/08/25 09:10:08 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index c7f101e9b44d..5488692bb24c 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)memalloc.h 8.2 (Berkeley) 5/4/95
- * $Id: memalloc.h,v 1.2 1994/09/24 02:57:51 davidg Exp $
+ * $Id: memalloc.h,v 1.3 1996/09/01 10:20:44 peter Exp $
*/
struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index dcff8f4ce7e0..5b9d521d0417 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: miscbltin.c,v 1.8.2.1 1997/08/25 09:10:10 jkh Exp $
+ * $Id: miscbltin.c,v 1.8.2.2 1998/02/15 11:32:25 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index 7c610d5c410f..61447f7f4c09 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,7 +35,7 @@
# SUCH DAMAGE.
#
# @(#)mkbuiltins 8.2 (Berkeley) 5/4/95
-# $Id: mkbuiltins,v 1.4 1996/06/24 04:22:22 jkh Exp $
+# $Id: mkbuiltins,v 1.5 1996/09/01 10:20:48 peter Exp $
temp=/tmp/ka$$
havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 3e5b3f2dd569..78b99d21a478 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mkinit.c,v 1.6 1996/09/01 10:20:50 peter Exp $
+ * $Id: mkinit.c,v 1.6.2.1 1997/08/25 09:10:12 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 7a28b0aec759..7fe1c69eecfd 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mknodes.c,v 1.4 1996/09/03 13:35:11 peter Exp $
+ * $Id: mknodes.c,v 1.4.2.1 1997/08/25 09:10:14 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 7f3662406657..f98aa4dd5d17 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mksyntax.c,v 1.6 1996/09/01 10:20:56 peter Exp $
+ * $Id: mksyntax.c,v 1.6.2.1 1997/08/25 09:10:16 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index 375ff8e99209..3d986b20ec81 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -35,7 +35,7 @@
# SUCH DAMAGE.
#
# @(#)mktokens 8.1 (Berkeley) 5/31/93
-# $Id: mktokens,v 1.2 1994/09/24 02:57:58 davidg Exp $
+# $Id: mktokens,v 1.3 1996/09/01 10:20:58 peter Exp $
# The following is a list of tokens. The second column is nonzero if the
# token marks the end of a list. The third column is the name to print in
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index f0fa314caeac..05d646b8bcba 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)myhistedit.h 8.2 (Berkeley) 5/4/95
- * $Id: myhistedit.h,v 1.3 1996/09/01 10:21:00 peter Exp $
+ * $Id: myhistedit.h,v 1.3.2.1 1997/08/25 09:10:17 jkh Exp $
*/
#include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 839a8cc680d2..5b8692e8c0eb 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: mystring.c,v 1.4 1996/09/03 14:15:55 peter Exp $
+ * $Id: mystring.c,v 1.4.2.1 1997/08/25 09:10:20 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index a1caa065708b..a1105a666b40 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)mystring.h 8.2 (Berkeley) 5/4/95
- * $Id: mystring.h,v 1.2 1994/09/24 02:58:00 davidg Exp $
+ * $Id: mystring.h,v 1.3 1996/09/01 10:21:05 peter Exp $
*/
#include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 0e0152e1cda2..cf721dcf7682 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95
- * $Id: nodes.c.pat,v 1.3 1996/09/01 10:21:08 peter Exp $
+ * $Id: nodes.c.pat,v 1.3.2.1 1997/08/25 09:10:21 jkh Exp $
*/
#include <stdlib.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index a2b12bfaec24..5f1b5bfc371a 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -34,7 +34,7 @@
# SUCH DAMAGE.
#
# @(#)nodetypes 8.2 (Berkeley) 5/4/95
-# $Id: nodetypes,v 1.2 1994/09/24 02:58:03 davidg Exp $
+# $Id: nodetypes,v 1.3 1996/09/01 10:21:12 peter Exp $
# This file describes the nodes used in parse trees. Unindented lines
# contain a node type followed by a structure tag. Subsequent indented
diff --git a/bin/sh/options.c b/bin/sh/options.c
index ada8bf958a00..f33d884cf859 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: options.c,v 1.8.2.1 1996/12/21 21:10:25 joerg Exp $
+ * $Id: options.c,v 1.8.2.2 1997/08/25 09:10:23 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/options.h b/bin/sh/options.h
index abd05146b1a7..77653966bc64 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)options.h 8.2 (Berkeley) 5/4/95
- * $Id: options.h,v 1.4 1996/10/29 03:12:49 steve Exp $
+ * $Id: options.h,v 1.4.2.1 1997/08/25 09:10:25 jkh Exp $
*/
struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 46ea07320c85..dd2a5ae15440 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: output.c,v 1.4 1996/09/03 14:15:56 peter Exp $
+ * $Id: output.c,v 1.4.2.1 1997/08/25 09:10:28 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/output.h b/bin/sh/output.h
index bfe69f7ce8ea..6fd50d725894 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)output.h 8.2 (Berkeley) 5/4/95
- * $Id: output.h,v 1.3 1996/09/01 10:21:29 peter Exp $
+ * $Id: output.h,v 1.3.2.1 1997/08/25 09:10:29 jkh Exp $
*/
#ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index a45f4ab304d0..22585cd132ec 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: parser.c,v 1.16 1996/09/10 02:42:33 peter Exp $
+ * $Id: parser.c,v 1.16.2.1 1997/08/25 09:10:30 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 4280d5888495..d080320d5720 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)parser.h 8.3 (Berkeley) 5/4/95
- * $Id: parser.h,v 1.3 1996/09/01 10:21:34 peter Exp $
+ * $Id: parser.h,v 1.3.2.1 1997/08/25 09:10:32 jkh Exp $
*/
/* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index d78e6554e590..b85d29571b50 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: redir.c,v 1.5 1996/09/01 10:21:36 peter Exp $
+ * $Id: redir.c,v 1.5.2.1 1997/08/25 09:10:35 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index e6bafda85af1..226300bf2085 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)redir.h 8.2 (Berkeley) 5/4/95
- * $Id: redir.h,v 1.3 1996/09/01 10:21:37 peter Exp $
+ * $Id: redir.h,v 1.3.2.1 1997/08/25 09:10:36 jkh Exp $
*/
/* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 6b56c5681fa4..8f8ccc2a5c13 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
-.\" $Id: sh.1,v 1.9.2.8 1998/02/15 11:32:26 jkh Exp $
+.\" $Id: sh.1,v 1.9.2.9 1998/06/30 06:42:53 charnier Exp $
.\"
.Dd May 5, 1995
.Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 2f4fe8a2a57b..a597dab53741 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)shell.h 8.2 (Berkeley) 5/4/95
- * $Id: shell.h,v 1.6 1996/10/31 07:15:57 ache Exp $
+ * $Id: shell.h,v 1.6.2.1 1997/08/25 09:10:41 jkh Exp $
*/
/*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 1748996fbfc1..f44078f09aa2 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: show.c,v 1.4 1996/09/03 14:16:00 peter Exp $
+ * $Id: show.c,v 1.4.2.1 1997/08/25 09:10:43 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/show.h b/bin/sh/show.h
index d10515098733..77cf89e07758 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)show.h 1.1 (Berkeley) 5/4/95
- * $Id: show.h,v 1.2 1996/09/01 10:21:45 peter Exp $
+ * $Id: show.h,v 1.2.2.1 1997/08/25 09:10:44 jkh Exp $
*/
void showtree __P((union node *));
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index e5f8c92c2d3a..b05114f8b99d 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: trap.c,v 1.4.2.1 1997/08/25 09:10:46 jkh Exp $
+ * $Id: trap.c,v 1.4.2.2 1998/02/15 11:32:27 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index cfa05f196fce..de8774bdd627 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)trap.h 8.3 (Berkeley) 6/5/95
- * $Id: trap.h,v 1.3.2.1 1997/08/25 09:10:48 jkh Exp $
+ * $Id: trap.h,v 1.3.2.2 1998/02/15 11:32:27 jkh Exp $
*/
extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 6d3b4d372d10..3616f1699744 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: var.c,v 1.6 1996/09/01 10:21:52 peter Exp $
+ * $Id: var.c,v 1.6.2.1 1997/08/25 09:10:50 jkh Exp $
*/
#ifndef lint
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 3207dc4ec2fa..fa788a0bc443 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)var.h 8.2 (Berkeley) 5/4/95
- * $Id: var.h,v 1.3 1996/09/01 10:21:54 peter Exp $
+ * $Id: var.h,v 1.3.2.1 1997/08/25 09:10:52 jkh Exp $
*/
/*