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/TOUR1
-rw-r--r--bin/sh/alias.c3
-rw-r--r--bin/sh/alias.h1
-rw-r--r--bin/sh/arith.h1
-rw-r--r--bin/sh/arith.y3
-rw-r--r--bin/sh/arith_lex.l3
-rw-r--r--bin/sh/bltin/bltin.h1
-rw-r--r--bin/sh/bltin/echo.11
-rw-r--r--bin/sh/bltin/echo.c1
-rw-r--r--bin/sh/builtins.def1
-rw-r--r--bin/sh/cd.c3
-rw-r--r--bin/sh/cd.h1
-rw-r--r--bin/sh/error.c3
-rw-r--r--bin/sh/error.h1
-rw-r--r--bin/sh/eval.h1
-rw-r--r--bin/sh/exec.c3
-rw-r--r--bin/sh/exec.h1
-rw-r--r--bin/sh/expand.c3
-rw-r--r--bin/sh/expand.h1
-rw-r--r--bin/sh/funcs/cmv1
-rw-r--r--bin/sh/funcs/dirs1
-rw-r--r--bin/sh/funcs/kill1
-rw-r--r--bin/sh/funcs/login1
-rw-r--r--bin/sh/funcs/newgrp1
-rw-r--r--bin/sh/funcs/popd1
-rw-r--r--bin/sh/funcs/pushd1
-rw-r--r--bin/sh/funcs/suspend1
-rw-r--r--bin/sh/histedit.c3
-rw-r--r--bin/sh/init.h1
-rw-r--r--bin/sh/input.c3
-rw-r--r--bin/sh/input.h1
-rw-r--r--bin/sh/jobs.c3
-rw-r--r--bin/sh/jobs.h1
-rw-r--r--bin/sh/machdep.h1
-rw-r--r--bin/sh/mail.c3
-rw-r--r--bin/sh/mail.h1
-rw-r--r--bin/sh/main.c3
-rw-r--r--bin/sh/main.h1
-rw-r--r--bin/sh/memalloc.c3
-rw-r--r--bin/sh/memalloc.h1
-rw-r--r--bin/sh/miscbltin.c3
-rw-r--r--bin/sh/mkbuiltins1
-rw-r--r--bin/sh/mkinit.c3
-rw-r--r--bin/sh/mknodes.c3
-rw-r--r--bin/sh/mksyntax.c3
-rw-r--r--bin/sh/mktokens1
-rw-r--r--bin/sh/myhistedit.h1
-rw-r--r--bin/sh/mystring.c3
-rw-r--r--bin/sh/mystring.h1
-rw-r--r--bin/sh/nodes.c.pat1
-rw-r--r--bin/sh/nodetypes1
-rw-r--r--bin/sh/options.c3
-rw-r--r--bin/sh/options.h1
-rw-r--r--bin/sh/output.c3
-rw-r--r--bin/sh/output.h1
-rw-r--r--bin/sh/parser.h1
-rw-r--r--bin/sh/redir.c3
-rw-r--r--bin/sh/redir.h1
-rw-r--r--bin/sh/sh.11
-rw-r--r--bin/sh/shell.h1
-rw-r--r--bin/sh/show.c3
-rw-r--r--bin/sh/show.h1
-rw-r--r--bin/sh/trap.c3
-rw-r--r--bin/sh/trap.h1
-rw-r--r--bin/sh/var.c3
-rw-r--r--bin/sh/var.h1
67 files changed, 91 insertions, 25 deletions
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index d84a34cabf4..59f71f6fdd5 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
+# $OpenBSD: Makefile,v 1.4 1996/06/23 14:21:05 deraadt Exp $
# $NetBSD: Makefile,v 1.23 1996/02/18 12:29:18 mycroft Exp $
-# @(#)Makefile 8.4 (Berkeley) 5/5/95
PROG= sh
SRCS= alias.c builtins.c cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index df043be5c42..27592163509 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,3 +1,4 @@
+# $OpenBSD: TOUR,v 1.2 1996/06/23 14:21:05 deraadt Exp $
# $NetBSD: TOUR,v 1.7 1995/05/11 21:28:38 christos Exp $
# @(#)TOUR 8.1 (Berkeley) 5/31/93
diff --git a/bin/sh/alias.c b/bin/sh/alias.c
index ad824d1b36b..7ac0327ce53 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: alias.c,v 1.2 1996/06/23 14:21:06 deraadt Exp $ */
/* $NetBSD: alias.c,v 1.6 1995/05/11 21:28:40 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)alias.c 8.3 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: alias.c,v 1.6 1995/05/11 21:28:40 christos Exp $";
+static char rcsid[] = "$OpenBSD: alias.c,v 1.2 1996/06/23 14:21:06 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index 85bdbad6969..03f636939e6 100644
--- a/bin/sh/alias.h
+++ b/bin/sh/alias.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: alias.h,v 1.2 1996/06/23 14:21:07 deraadt Exp $ */
/* $NetBSD: alias.h,v 1.4 1995/05/11 21:28:42 christos Exp $ */
/*-
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index d71dd6c367d..32a95a14ad7 100644
--- a/bin/sh/arith.h
+++ b/bin/sh/arith.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: arith.h,v 1.2 1996/06/23 14:21:07 deraadt Exp $ */
/* $NetBSD: arith.h,v 1.1 1995/05/11 21:28:44 christos Exp $ */
/*-
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index d35c5ac5f01..a5e832d1f48 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -1,3 +1,4 @@
+/* $OpenBSD: arith.y,v 1.2 1996/06/23 14:21:08 deraadt Exp $ */
%token ARITH_NUM ARITH_LPAREN ARITH_RPAREN
%left ARITH_OR
@@ -95,7 +96,7 @@ expr: ARITH_LPAREN expr ARITH_RPAREN = { $$ = $2; }
#if 0
static char sccsid[] = "@(#)arith.y 8.3 (Berkeley) 5/4/95";
#else
-static char sccsid[] = "$NetBSD: arith.y,v 1.6 1995/05/11 21:28:45 christos Exp $";
+static char sccsid[] = "$OpenBSD: arith.y,v 1.2 1996/06/23 14:21:08 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 451453ce2f4..8141a7ca48b 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -1,4 +1,5 @@
%{
+/* $OpenBSD: arith_lex.l,v 1.2 1996/06/23 14:21:08 deraadt Exp $ */
/* $NetBSD: arith_lex.l,v 1.5 1995/05/11 21:28:46 christos Exp $ */
/*-
@@ -41,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)arith_lex.l 8.3 (Berkeley) 5/4/95";
#else
-static char sccsid[] = "$NetBSD: arith_lex.l,v 1.5 1995/05/11 21:28:46 christos Exp $";
+static char sccsid[] = "$OpenBSD: arith_lex.l,v 1.2 1996/06/23 14:21:08 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index e027c685497..9061ea52dc7 100644
--- a/bin/sh/bltin/bltin.h
+++ b/bin/sh/bltin/bltin.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: bltin.h,v 1.2 1996/06/23 14:21:40 deraadt Exp $ */
/* $NetBSD: bltin.h,v 1.7 1995/03/21 09:10:46 cgd Exp $ */
/*-
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 2b3dccd1a6f..71949968f95 100644
--- a/bin/sh/bltin/echo.1
+++ b/bin/sh/bltin/echo.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: echo.1,v 1.2 1996/06/23 14:21:41 deraadt Exp $
.\" $NetBSD: echo.1,v 1.7 1995/03/21 09:10:48 cgd Exp $
.\"
.\" Copyright (c) 1991, 1993
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index 2a9edb11978..31f3cc51ebe 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: echo.c,v 1.2 1996/06/23 14:21:41 deraadt Exp $ */
/* $NetBSD: echo.c,v 1.7 1995/03/21 09:10:49 cgd Exp $ */
/*-
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index de129bb873c..f7bf8bb8e30 100644
--- a/bin/sh/builtins.def
+++ b/bin/sh/builtins.def
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: builtins.def,v 1.2 1996/06/23 14:21:09 deraadt Exp $
# $NetBSD: builtins.def,v 1.12 1995/05/11 21:28:48 christos Exp $
#
# Copyright (c) 1991, 1993
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index 08a08bbf34e..b00266ad4a7 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: cd.c,v 1.6 1996/06/23 14:21:09 deraadt Exp $ */
/* $NetBSD: cd.c,v 1.15 1996/03/01 01:58:58 jtc Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)cd.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: cd.c,v 1.15 1996/03/01 01:58:58 jtc Exp $";
+static char rcsid[] = "$OpenBSD: cd.c,v 1.6 1996/06/23 14:21:09 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 9226f096faa..9fc61fa1f25 100644
--- a/bin/sh/cd.h
+++ b/bin/sh/cd.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: cd.h,v 1.2 1996/06/23 14:21:10 deraadt Exp $ */
/* $NetBSD: cd.h,v 1.1 1995/11/19 23:27:40 christos Exp $ */
/*-
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 093986b0541..489f00f0fee 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: error.c,v 1.2 1996/06/23 14:21:10 deraadt Exp $ */
/* $NetBSD: error.c,v 1.14 1995/05/11 21:28:51 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: error.c,v 1.14 1995/05/11 21:28:51 christos Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.2 1996/06/23 14:21:10 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/error.h b/bin/sh/error.h
index b8e999dc3a8..4e7435887e4 100644
--- a/bin/sh/error.h
+++ b/bin/sh/error.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: error.h,v 1.2 1996/06/23 14:21:11 deraadt Exp $ */
/* $NetBSD: error.h,v 1.8 1995/05/11 21:28:53 christos Exp $ */
/*-
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index 58b05807254..8de880e939e 100644
--- a/bin/sh/eval.h
+++ b/bin/sh/eval.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: eval.h,v 1.2 1996/06/23 14:21:12 deraadt Exp $ */
/* $NetBSD: eval.h,v 1.9 1995/09/11 17:05:43 christos Exp $ */
/*-
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 461f8cc40e2..b96a7dd77a8 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: exec.c,v 1.2 1996/06/23 14:21:12 deraadt Exp $ */
/* $NetBSD: exec.c,v 1.17 1995/06/09 01:53:50 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95";
#else
-static char rcsid[] = "$NetBSD: exec.c,v 1.17 1995/06/09 01:53:50 christos Exp $";
+static char rcsid[] = "$OpenBSD: exec.c,v 1.2 1996/06/23 14:21:12 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index ac1b0a98551..24e99746f83 100644
--- a/bin/sh/exec.h
+++ b/bin/sh/exec.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: exec.h,v 1.2 1996/06/23 14:21:13 deraadt Exp $ */
/* $NetBSD: exec.h,v 1.9 1995/06/09 01:53:53 christos Exp $ */
/*-
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 2877a73a5f2..c3a43e3bcfd 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: expand.c,v 1.3 1996/06/23 14:21:13 deraadt Exp $ */
/* $NetBSD: expand.c,v 1.20 1996/02/12 15:11:41 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-static char rcsid[] = "$NetBSD: expand.c,v 1.20 1996/02/12 15:11:41 christos Exp $";
+static char rcsid[] = "$OpenBSD: expand.c,v 1.3 1996/06/23 14:21:13 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index a4dde985e57..403925e36a7 100644
--- a/bin/sh/expand.h
+++ b/bin/sh/expand.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: expand.h,v 1.2 1996/06/23 14:21:14 deraadt Exp $ */
/* $NetBSD: expand.h,v 1.8 1995/05/11 21:29:08 christos Exp $ */
/*-
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 667f846e08a..3813a3a1d28 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -1,3 +1,4 @@
+# $OpenBSD: cmv,v 1.2 1996/06/23 14:21:42 deraadt Exp $
# $NetBSD: cmv,v 1.7 1995/05/11 21:31:05 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index 68bb317bb7a..25a52f5bfa4 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -1,3 +1,4 @@
+# $OpenBSD: dirs,v 1.2 1996/06/23 14:21:43 deraadt Exp $
# $NetBSD: dirs,v 1.7 1995/05/11 21:31:08 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/kill b/bin/sh/funcs/kill
index 75b0180bff7..c22886220f3 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -1,3 +1,4 @@
+# $OpenBSD: kill,v 1.2 1996/06/23 14:21:43 deraadt Exp $
# $NetBSD: kill,v 1.7 1995/05/11 21:31:10 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/login b/bin/sh/funcs/login
index 7ae08b2b037..1f119042751 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -1,3 +1,4 @@
+# $OpenBSD: login,v 1.2 1996/06/23 14:21:44 deraadt Exp $
# $NetBSD: login,v 1.7 1995/05/11 21:31:11 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/newgrp b/bin/sh/funcs/newgrp
index 796a4f184e8..0e597f9bc80 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -1,3 +1,4 @@
+# $OpenBSD: newgrp,v 1.2 1996/06/23 14:21:44 deraadt Exp $
# $NetBSD: newgrp,v 1.7 1995/05/11 21:31:12 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index b2b65d5c2aa..de75ed296f5 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -1,3 +1,4 @@
+# $OpenBSD: popd,v 1.2 1996/06/23 14:21:45 deraadt Exp $
# $NetBSD: popd,v 1.7 1995/05/11 21:31:13 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/pushd b/bin/sh/funcs/pushd
index b3930380c99..295d3236085 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -1,3 +1,4 @@
+# $OpenBSD: pushd,v 1.2 1996/06/23 14:21:46 deraadt Exp $
# $NetBSD: pushd,v 1.7 1995/05/11 21:31:15 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/funcs/suspend b/bin/sh/funcs/suspend
index 8a4197dfef8..6230a0af953 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -1,3 +1,4 @@
+# $OpenBSD: suspend,v 1.2 1996/06/23 14:21:46 deraadt Exp $
# $NetBSD: suspend,v 1.7 1995/05/11 21:31:17 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 3213fe5ba7d..49d2ddb978c 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: histedit.c,v 1.2 1996/06/23 14:21:15 deraadt Exp $ */
/* $NetBSD: histedit.c,v 1.8 1995/05/11 21:29:12 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)histedit.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: histedit.c,v 1.8 1995/05/11 21:29:12 christos Exp $";
+static char rcsid[] = "$OpenBSD: histedit.c,v 1.2 1996/06/23 14:21:15 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 3252aec7330..6ff740606e8 100644
--- a/bin/sh/init.h
+++ b/bin/sh/init.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: init.h,v 1.2 1996/06/23 14:21:15 deraadt Exp $ */
/* $NetBSD: init.h,v 1.8 1995/05/11 21:29:14 christos Exp $ */
/*-
diff --git a/bin/sh/input.c b/bin/sh/input.c
index b4a26794c0a..ad8eb2cc14c 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: input.c,v 1.3 1996/06/23 14:21:16 deraadt Exp $ */
/* $NetBSD: input.c,v 1.19 1995/10/19 04:14:37 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.3 (Berkeley) 6/9/95";
#else
-static char rcsid[] = "$NetBSD: input.c,v 1.19 1995/10/19 04:14:37 christos Exp $";
+static char rcsid[] = "$OpenBSD: input.c,v 1.3 1996/06/23 14:21:16 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/input.h b/bin/sh/input.h
index 92bff914f4b..3d041c93444 100644
--- a/bin/sh/input.h
+++ b/bin/sh/input.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: input.h,v 1.2 1996/06/23 14:21:16 deraadt Exp $ */
/* $NetBSD: input.h,v 1.8 1995/05/11 21:29:16 christos Exp $ */
/*-
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index 39c9d580699..428c99f0750 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: jobs.c,v 1.2 1996/06/23 14:21:17 deraadt Exp $ */
/* $NetBSD: jobs.c,v 1.17 1995/07/04 16:26:45 pk Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: jobs.c,v 1.17 1995/07/04 16:26:45 pk Exp $";
+static char rcsid[] = "$OpenBSD: jobs.c,v 1.2 1996/06/23 14:21:17 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 940286f91f1..d4868c8a418 100644
--- a/bin/sh/jobs.h
+++ b/bin/sh/jobs.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: jobs.h,v 1.2 1996/06/23 14:21:18 deraadt Exp $ */
/* $NetBSD: jobs.h,v 1.8 1995/05/11 21:29:19 christos Exp $ */
/*-
diff --git a/bin/sh/machdep.h b/bin/sh/machdep.h
index c9452eb455d..991520171d5 100644
--- a/bin/sh/machdep.h
+++ b/bin/sh/machdep.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: machdep.h,v 1.2 1996/06/23 14:21:18 deraadt Exp $ */
/* $NetBSD: machdep.h,v 1.8 1995/05/11 21:29:21 christos Exp $ */
/*-
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 001c77dbc0f..294fa180f1d 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mail.c,v 1.2 1996/06/23 14:21:19 deraadt Exp $ */
/* $NetBSD: mail.c,v 1.9 1995/05/11 21:29:22 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)mail.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: mail.c,v 1.9 1995/05/11 21:29:22 christos Exp $";
+static char rcsid[] = "$OpenBSD: mail.c,v 1.2 1996/06/23 14:21:19 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index e8df3cfaf58..8f836a327fa 100644
--- a/bin/sh/mail.h
+++ b/bin/sh/mail.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: mail.h,v 1.2 1996/06/23 14:21:19 deraadt Exp $ */
/* $NetBSD: mail.h,v 1.8 1995/05/11 21:29:23 christos Exp $ */
/*-
diff --git a/bin/sh/main.c b/bin/sh/main.c
index 5c75cff3196..a4c6a67eb73 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.c,v 1.4 1996/06/23 14:21:20 deraadt Exp $ */
/* $NetBSD: main.c,v 1.23 1995/11/19 23:27:42 christos Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-static char rcsid[] = "$NetBSD: main.c,v 1.23 1995/11/19 23:27:42 christos Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.4 1996/06/23 14:21:20 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/main.h b/bin/sh/main.h
index bfe88becff3..5d25aadff34 100644
--- a/bin/sh/main.h
+++ b/bin/sh/main.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: main.h,v 1.2 1996/06/23 14:21:20 deraadt Exp $ */
/* $NetBSD: main.h,v 1.8 1995/05/11 21:29:27 christos Exp $ */
/*-
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 95413253c59..61c1c4fbb63 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: memalloc.c,v 1.3 1996/06/23 14:21:21 deraadt Exp $ */
/* $NetBSD: memalloc.c,v 1.17 1996/05/20 14:49:32 cgd Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)memalloc.c 8.3 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: memalloc.c,v 1.17 1996/05/20 14:49:32 cgd Exp $";
+static char rcsid[] = "$OpenBSD: memalloc.c,v 1.3 1996/06/23 14:21:21 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index eb0abe41330..837f1ed3aed 100644
--- a/bin/sh/memalloc.h
+++ b/bin/sh/memalloc.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: memalloc.h,v 1.2 1996/06/23 14:21:21 deraadt Exp $ */
/* $NetBSD: memalloc.h,v 1.10 1995/05/11 21:29:31 christos Exp $ */
/*-
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 983296a5c1f..8b483e92e3c 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: miscbltin.c,v 1.2 1996/06/23 14:21:22 deraadt Exp $ */
/* $NetBSD: miscbltin.c,v 1.15 1995/06/12 19:44:16 jtc Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)miscbltin.c 8.4 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: miscbltin.c,v 1.15 1995/06/12 19:44:16 jtc Exp $";
+static char rcsid[] = "$OpenBSD: miscbltin.c,v 1.2 1996/06/23 14:21:22 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index 345d68bb59d..a79f8a3a40e 100644
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: mkbuiltins,v 1.2 1996/06/23 14:21:22 deraadt Exp $
# $NetBSD: mkbuiltins,v 1.12 1995/05/11 21:29:33 christos Exp $
#
# Copyright (c) 1991, 1993
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index b2bfbc02d98..8a5df1ff9d0 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mkinit.c,v 1.3 1996/06/23 14:21:23 deraadt Exp $ */
/* $NetBSD: mkinit.c,v 1.14 1996/02/18 12:29:21 mycroft Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mkinit.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: mkinit.c,v 1.14 1996/02/18 12:29:21 mycroft Exp $";
+static char rcsid[] = "$OpenBSD: mkinit.c,v 1.3 1996/06/23 14:21:23 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index 259631df377..ddf3dc2b2e3 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mknodes.c,v 1.2 1996/06/23 14:21:24 deraadt Exp $ */
/* $NetBSD: mknodes.c,v 1.11 1995/05/11 21:29:36 christos Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mknodes.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: mknodes.c,v 1.11 1995/05/11 21:29:36 christos Exp $";
+static char rcsid[] = "$OpenBSD: mknodes.c,v 1.2 1996/06/23 14:21:24 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index 5b17e5fa1ac..947e7090a99 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mksyntax.c,v 1.2 1996/06/23 14:21:24 deraadt Exp $ */
/* $NetBSD: mksyntax.c,v 1.11 1995/05/11 21:29:37 christos Exp $ */
/*-
@@ -46,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mksyntax.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: mksyntax.c,v 1.11 1995/05/11 21:29:37 christos Exp $";
+static char rcsid[] = "$OpenBSD: mksyntax.c,v 1.2 1996/06/23 14:21:24 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index 739240eacca..d0fdda452ac 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -1,4 +1,5 @@
#!/bin/sh -
+# $OpenBSD: mktokens,v 1.2 1996/06/23 14:21:25 deraadt Exp $
# $NetBSD: mktokens,v 1.7 1995/05/11 21:29:38 christos Exp $
#
# Copyright (c) 1991, 1993
diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h
index 47b568c6dd3..6fc9459eca8 100644
--- a/bin/sh/myhistedit.h
+++ b/bin/sh/myhistedit.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: myhistedit.h,v 1.2 1996/06/23 14:21:25 deraadt Exp $ */
/* $NetBSD: myhistedit.h,v 1.4 1995/05/11 21:29:40 christos Exp $ */
/*-
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 6fde5228c56..49178a9cb6b 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: mystring.c,v 1.2 1996/06/23 14:21:26 deraadt Exp $ */
/* $NetBSD: mystring.c,v 1.10 1995/05/11 21:29:41 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)mystring.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: mystring.c,v 1.10 1995/05/11 21:29:41 christos Exp $";
+static char rcsid[] = "$OpenBSD: mystring.c,v 1.2 1996/06/23 14:21:26 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 50e67411a68..8739724ecc6 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: mystring.h,v 1.2 1996/06/23 14:21:27 deraadt Exp $ */
/* $NetBSD: mystring.h,v 1.9 1995/05/11 21:29:42 christos Exp $ */
/*-
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index ff921663581..1bdfa5a9927 100644
--- a/bin/sh/nodes.c.pat
+++ b/bin/sh/nodes.c.pat
@@ -1,3 +1,4 @@
+/* $OpenBSD: nodes.c.pat,v 1.2 1996/06/23 14:21:27 deraadt Exp $ */
/* $NetBSD: nodes.c.pat,v 1.7 1995/05/11 21:29:43 christos Exp $ */
/*-
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index cab5e027f11..41e95c8f54f 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -1,3 +1,4 @@
+# $OpenBSD: nodetypes,v 1.2 1996/06/23 14:21:28 deraadt Exp $
# $NetBSD: nodetypes,v 1.8 1995/05/11 21:29:44 christos Exp $
# Copyright (c) 1991, 1993
# The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/options.c b/bin/sh/options.c
index 788852bb2d7..6132bb00254 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: options.c,v 1.2 1996/06/23 14:21:28 deraadt Exp $ */
/* $NetBSD: options.c,v 1.14 1995/05/11 21:29:46 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: options.c,v 1.14 1995/05/11 21:29:46 christos Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.2 1996/06/23 14:21:28 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 944dba34629..abc9d7ac770 100644
--- a/bin/sh/options.h
+++ b/bin/sh/options.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: options.h,v 1.2 1996/06/23 14:21:29 deraadt Exp $ */
/* $NetBSD: options.h,v 1.8 1995/05/11 21:29:48 christos Exp $ */
/*-
diff --git a/bin/sh/output.c b/bin/sh/output.c
index 1512893e43e..49e7a85408e 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: output.c,v 1.2 1996/06/23 14:21:30 deraadt Exp $ */
/* $NetBSD: output.c,v 1.15 1995/09/14 16:19:06 jtc Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)output.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: output.c,v 1.15 1995/09/14 16:19:06 jtc Exp $";
+static char rcsid[] = "$OpenBSD: output.c,v 1.2 1996/06/23 14:21:30 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/output.h b/bin/sh/output.h
index bd76286c92b..be89552710c 100644
--- a/bin/sh/output.h
+++ b/bin/sh/output.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: output.h,v 1.2 1996/06/23 14:21:30 deraadt Exp $ */
/* $NetBSD: output.h,v 1.11 1995/05/11 21:29:53 christos Exp $ */
/*-
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index 1b4fe23cc30..9ad22f8a71d 100644
--- a/bin/sh/parser.h
+++ b/bin/sh/parser.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: parser.h,v 1.2 1996/06/23 14:21:31 deraadt Exp $ */
/* $NetBSD: parser.h,v 1.10 1995/05/11 21:30:02 christos Exp $ */
/*-
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 7426209ffd6..94b43609fb6 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: redir.c,v 1.2 1996/06/23 14:21:31 deraadt Exp $ */
/* $NetBSD: redir.c,v 1.12 1995/05/11 21:30:10 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: redir.c,v 1.12 1995/05/11 21:30:10 christos Exp $";
+static char rcsid[] = "$OpenBSD: redir.c,v 1.2 1996/06/23 14:21:31 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index ea329e7028e..3e6883ab513 100644
--- a/bin/sh/redir.h
+++ b/bin/sh/redir.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: redir.h,v 1.2 1996/06/23 14:21:32 deraadt Exp $ */
/* $NetBSD: redir.h,v 1.9 1995/05/11 21:30:13 christos Exp $ */
/*-
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index e038811db76..eb8d701f6a2 100644
--- a/bin/sh/sh.1
+++ b/bin/sh/sh.1
@@ -1,3 +1,4 @@
+.\" $OpenBSD: sh.1,v 1.2 1996/06/23 14:21:32 deraadt Exp $
.\" $NetBSD: sh.1,v 1.15 1995/05/11 21:30:18 christos Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index 5419e330c1d..2074af9d85a 100644
--- a/bin/sh/shell.h
+++ b/bin/sh/shell.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: shell.h,v 1.4 1996/06/23 14:21:33 deraadt Exp $ */
/* $NetBSD: shell.h,v 1.9 1996/03/01 01:59:00 jtc Exp $ */
/*-
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 3ca9b1e157f..e9246b8975b 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: show.c,v 1.2 1996/06/23 14:21:34 deraadt Exp $ */
/* $NetBSD: show.c,v 1.11 1995/05/11 21:30:24 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: show.c,v 1.11 1995/05/11 21:30:24 christos Exp $";
+static char rcsid[] = "$OpenBSD: show.c,v 1.2 1996/06/23 14:21:34 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/show.h b/bin/sh/show.h
index 7ea6803ebe0..60537fa6b1e 100644
--- a/bin/sh/show.h
+++ b/bin/sh/show.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: show.h,v 1.2 1996/06/23 14:21:34 deraadt Exp $ */
/* $NetBSD: show.h,v 1.1 1995/05/11 21:30:27 christos Exp $ */
/*-
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 836ce976414..a30a525a023 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: trap.c,v 1.2 1996/06/23 14:21:35 deraadt Exp $ */
/* $NetBSD: trap.c,v 1.15 1995/06/07 04:16:57 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)trap.c 8.5 (Berkeley) 6/5/95";
#else
-static char rcsid[] = "$NetBSD: trap.c,v 1.15 1995/06/07 04:16:57 christos Exp $";
+static char rcsid[] = "$OpenBSD: trap.c,v 1.2 1996/06/23 14:21:35 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 64abb12b420..c464817c5a9 100644
--- a/bin/sh/trap.h
+++ b/bin/sh/trap.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: trap.h,v 1.2 1996/06/23 14:21:36 deraadt Exp $ */
/* $NetBSD: trap.h,v 1.10 1995/06/07 04:17:00 christos Exp $ */
/*-
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 9e0a4c46819..668e3e68815 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: var.c,v 1.2 1996/06/23 14:21:36 deraadt Exp $ */
/* $NetBSD: var.c,v 1.13 1995/05/11 21:30:39 christos Exp $ */
/*-
@@ -40,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.3 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$NetBSD: var.c,v 1.13 1995/05/11 21:30:39 christos Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.2 1996/06/23 14:21:36 deraadt Exp $";
#endif
#endif /* not lint */
diff --git a/bin/sh/var.h b/bin/sh/var.h
index 496b9788108..a7cd07bd712 100644
--- a/bin/sh/var.h
+++ b/bin/sh/var.h
@@ -1,3 +1,4 @@
+/* $OpenBSD: var.h,v 1.2 1996/06/23 14:21:37 deraadt Exp $ */
/* $NetBSD: var.h,v 1.9 1995/05/11 21:30:44 christos Exp $ */
/*-