release/5.2.1_cvs

68 files changed, 68 insertions, 68 deletions

diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 27a77e73eb48..55771a515c81 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/Makefile,v 1.40.4.1 2003/12/07 04:03:59 scottl Exp $
 
 PROG=	sh
 SHSRCS=	alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \
diff --git a/bin/sh/TOUR b/bin/sh/TOUR
index 5a0b76b7ea90..66605d290293 100644
--- a/bin/sh/TOUR
+++ b/bin/sh/TOUR
@@ -1,5 +1,5 @@
 #	@(#)TOUR	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/TOUR,v 1.6 1999/08/27 23:15:07 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 45cfd74a2d53..d18c750ef19d 100644
--- a/bin/sh/alias.c
+++ b/bin/sh/alias.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)alias.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.17 2003/07/05 15:18:44 dds Exp $");
 
 #include <stdlib.h>
 #include "shell.h"
diff --git a/bin/sh/alias.h b/bin/sh/alias.h
index a5879ef94ed5..1506ccd1bc75 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/alias.h,v 1.7 2002/02/02 06:50:45 imp Exp $
  */
 
 #define ALIASINUSE	1
diff --git a/bin/sh/arith.h b/bin/sh/arith.h
index ab9a848589be..9df69b079a66 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/arith.h,v 1.8 2003/09/04 18:28:42 schweikh Exp $
  */
 
 int arith(char *);
diff --git a/bin/sh/arith.y b/bin/sh/arith.y
index a445a4328439..0ae73b4202d4 100644
--- a/bin/sh/arith.y
+++ b/bin/sh/arith.y
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)arith.y	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.17 2003/09/07 10:14:56 schweikh Exp $");
 
 #include <limits.h>
 #include "shell.h"
diff --git a/bin/sh/arith_lex.l b/bin/sh/arith_lex.l
index 98146cb04a87..91771be79b2b 100644
--- a/bin/sh/arith_lex.l
+++ b/bin/sh/arith_lex.l
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)arith_lex.l	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.21 2003/09/06 16:33:55 tjr Exp $");
 
 #include <string.h>
 
diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h
index 9d6e68deb04e..6835ba872d7a 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/bltin/bltin.h,v 1.12 2002/02/02 06:50:55 imp Exp $
  */
 
 /*
diff --git a/bin/sh/bltin/echo.1 b/bin/sh/bltin/echo.1
index 15393b1f1c4c..ec8c0c63d634 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/bltin/echo.1,v 1.11 2002/12/05 08:49:59 ru Exp $
 .\"
 .Dd May 4, 1995
 .Dt ECHO 1
diff --git a/bin/sh/bltin/echo.c b/bin/sh/bltin/echo.c
index fcd62662479a..ee6558cc8037 100644
--- a/bin/sh/bltin/echo.c
+++ b/bin/sh/bltin/echo.c
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/bltin/echo.c,v 1.13 2003/02/05 13:23:46 charnier Exp $");
 
 /*
  * Echo command.
diff --git a/bin/sh/builtins.def b/bin/sh/builtins.def
index a5d4542a7db9..9350a59640ae 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
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/builtins.def,v 1.13 2002/12/26 14:28:54 tjr 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 3a45d95e6ea7..7780cc2f0abb 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)cd.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.33 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/cd.h b/bin/sh/cd.h
index 043d405e3de7..b8cb12658a85 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.
  *
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/cd.h,v 1.6 2002/02/02 06:50:46 imp Exp $
  */
 
 char	*getpwd(void);
diff --git a/bin/sh/error.c b/bin/sh/error.c
index 7b00c8b7cc81..fa80bd14ac8b 100644
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.24 2002/09/29 11:37:39 tjr Exp $");
 
 /*
  * Errors and exceptions.
diff --git a/bin/sh/error.h b/bin/sh/error.h
index 87442e035bc5..ae45e7f42401 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/error.h,v 1.16 2002/09/29 11:37:39 tjr Exp $
  */
 
 /*
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index 412f65092e13..ebce46b3300b 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.37 2003/01/21 10:06:04 tjr Exp $");
 
 #include <paths.h>
 #include <signal.h>
diff --git a/bin/sh/eval.h b/bin/sh/eval.h
index ff30c0c1695a..bdfc4e067c42 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/eval.h,v 1.9 2002/07/21 06:49:14 tjr Exp $
  */
 
 extern char *commandname;	/* currently executing command */
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 5a1997742364..c57d2d7885ed 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)exec.c	8.4 (Berkeley) 6/8/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.23 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/exec.h b/bin/sh/exec.h
index dd1fd81ce217..20cc2eb84db6 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/exec.h,v 1.11 2003/07/05 15:18:44 dds Exp $
  */
 
 /* values of cmdtype */
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 261bc7e3108b..280b926683ed 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.45 2003/08/03 04:28:10 ache Exp $");
 
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/bin/sh/expand.h b/bin/sh/expand.h
index 9343bf3949a0..5e62f05417b3 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/expand.h,v 1.11 2002/12/26 14:28:54 tjr Exp $
  */
 
 struct strlist {
diff --git a/bin/sh/funcs/cmv b/bin/sh/funcs/cmv
index 6e9dcff9c088..b43e6919c89c 100644
--- a/bin/sh/funcs/cmv
+++ b/bin/sh/funcs/cmv
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)cmv	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/cmv,v 1.6 1999/08/27 23:15:33 peter Exp $
 
 # Conditional move--don't replace an existing file.
 
diff --git a/bin/sh/funcs/dirs b/bin/sh/funcs/dirs
index a5d3c8e7eeff..83916f553faa 100644
--- a/bin/sh/funcs/dirs
+++ b/bin/sh/funcs/dirs
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)dirs	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/dirs,v 1.6 1999/08/27 23:15:34 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 7455571f8b98..d5ea3536884f 100644
--- a/bin/sh/funcs/kill
+++ b/bin/sh/funcs/kill
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)kill	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/kill,v 1.6 1999/08/27 23:15:34 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 7a6fc855bfc2..d8f5ae29dad5 100644
--- a/bin/sh/funcs/login
+++ b/bin/sh/funcs/login
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)login	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/login,v 1.6 1999/08/27 23:15:34 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 fd8e5d6ee5a7..cbb0b3acdcab 100644
--- a/bin/sh/funcs/newgrp
+++ b/bin/sh/funcs/newgrp
@@ -33,6 +33,6 @@
 # SUCH DAMAGE.
 #
 #	@(#)newgrp	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/newgrp,v 1.6 1999/08/27 23:15:34 peter Exp $
 
 newgrp() exec newgrp "$@"
diff --git a/bin/sh/funcs/popd b/bin/sh/funcs/popd
index e0be35a13a79..fb0d4fab159e 100644
--- a/bin/sh/funcs/popd
+++ b/bin/sh/funcs/popd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)popd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/popd,v 1.6 1999/08/27 23:15:35 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 d60ede2cbbcc..94325e9fae8c 100644
--- a/bin/sh/funcs/pushd
+++ b/bin/sh/funcs/pushd
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)pushd	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/pushd,v 1.6 1999/08/27 23:15:35 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 f06e12ff0575..69817cceec45 100644
--- a/bin/sh/funcs/suspend
+++ b/bin/sh/funcs/suspend
@@ -33,7 +33,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)suspend	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/funcs/suspend,v 1.6 1999/08/27 23:15:35 peter Exp $
 
 suspend() {
 	local -
diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c
index 1e64171ea372..30cf993bbcc1 100644
--- a/bin/sh/histedit.c
+++ b/bin/sh/histedit.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)histedit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.25 2002/10/30 06:34:52 tjr Exp $");
 
 #include <sys/param.h>
 #include <limits.h>
diff --git a/bin/sh/init.h b/bin/sh/init.h
index 57359dd1a798..2ebeeaa2f2fd 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/init.h,v 1.7 2002/02/02 06:50:46 imp Exp $
  */
 
 void init(void);
diff --git a/bin/sh/input.c b/bin/sh/input.c
index 85b94d6759ec..179b90c4bf44 100644
--- a/bin/sh/input.c
+++ b/bin/sh/input.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)input.c	8.3 (Berkeley) 6/9/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.20 2003/07/05 15:18:44 dds Exp $");
 
 #include <stdio.h>	/* defines BUFSIZ */
 #include <fcntl.h>
diff --git a/bin/sh/input.h b/bin/sh/input.h
index bab05c495843..ee5036b3f23f 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/input.h,v 1.8 2002/02/02 06:50:46 imp 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 7c9cfa4005f9..fe91a3975bbd 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)jobs.c	8.5 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.64 2003/07/05 15:18:44 dds Exp $");
 
 #include <fcntl.h>
 #include <signal.h>
diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h
index 53c0ba05ae0e..8998bfb0c2e6 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/jobs.h,v 1.17 2002/07/18 10:22:42 tjr Exp $
  */
 
 /* Mode argument to forkshell.  Don't change FORK_FG or FORK_BG. */
diff --git a/bin/sh/mail.c b/bin/sh/mail.c
index 482b501b6376..542db73f3f98 100644
--- a/bin/sh/mail.c
+++ b/bin/sh/mail.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mail.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.12 2002/06/30 05:15:03 obrien Exp $");
 
 /*
  * Routines to check for mail.  (Perhaps make part of main.c?)
diff --git a/bin/sh/mail.h b/bin/sh/mail.h
index a77029c17289..c6bc33e9538f 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mail.h,v 1.7 2002/02/02 06:50:46 imp Exp $
  */
 
 void chkmail(int);
diff --git a/bin/sh/main.c b/bin/sh/main.c
index f47ab0a283e8..062171e08337 100644
--- a/bin/sh/main.c
+++ b/bin/sh/main.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/28/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.25 2002/10/01 01:30:33 tjr Exp $");
 
 #include <stdio.h>
 #include <signal.h>
diff --git a/bin/sh/main.h b/bin/sh/main.h
index b1d06efd8fb4..4e04d3ae6014 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/main.h,v 1.7 2002/02/02 06:50:46 imp Exp $
  */
 
 extern int rootpid;	/* pid of main shell */
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index 6334290bd10d..017004a81fb8 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)memalloc.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.25 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/param.h>
 #include "shell.h"
diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h
index c43d8fd1ccfe..57bdc7313199 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/memalloc.h,v 1.8 2002/02/02 06:50:46 imp Exp $
  */
 
 struct stackmark {
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index bdd22e0195a3..9aea11724826 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.29 2002/10/01 11:44:38 mux Exp $");
 
 /*
  * Miscellaneous builtins.
diff --git a/bin/sh/mkbuiltins b/bin/sh/mkbuiltins
index d91cd91d49e9..c132cadd3008 100755
--- a/bin/sh/mkbuiltins
+++ b/bin/sh/mkbuiltins
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mkbuiltins	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mkbuiltins,v 1.12 2003/09/13 06:59:22 schweikh Exp $
 
 temp=`/usr/bin/mktemp -t ka`
 havejobs=0
diff --git a/bin/sh/mkinit.c b/bin/sh/mkinit.c
index 5902fe6ce4e0..1839f1b1dd78 100644
--- a/bin/sh/mkinit.c
+++ b/bin/sh/mkinit.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mkinit.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mkinit.c,v 1.16 2002/06/30 05:15:03 obrien Exp $");
 
 /*
  * This program scans all the source files for code to handle various
diff --git a/bin/sh/mknodes.c b/bin/sh/mknodes.c
index d87179b3c4f5..8d4634c55301 100644
--- a/bin/sh/mknodes.c
+++ b/bin/sh/mknodes.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mknodes.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mknodes.c,v 1.16 2003/05/01 16:58:56 obrien Exp $");
 
 /*
  * This program reads the nodetypes file and nodes.c.pat file.  It generates
diff --git a/bin/sh/mksyntax.c b/bin/sh/mksyntax.c
index d75b68af8d50..ebabf22facba 100644
--- a/bin/sh/mksyntax.c
+++ b/bin/sh/mksyntax.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)mksyntax.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.22 2003/05/01 16:58:56 obrien Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
diff --git a/bin/sh/mktokens b/bin/sh/mktokens
index e08997f7e9cf..88e04895b909 100644
--- a/bin/sh/mktokens
+++ b/bin/sh/mktokens
@@ -35,7 +35,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)mktokens	8.1 (Berkeley) 5/31/93
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/mktokens,v 1.8 2002/06/20 05:20:50 jmallett 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 644b2c025302..2453855e989f 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/myhistedit.h,v 1.9 2002/07/23 11:50:53 tjr Exp $
  */
 
 #include <histedit.h>
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index bc3d1cac84da..4c0cab17c7f0 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)mystring.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/mystring.c,v 1.12 2002/06/30 05:15:04 obrien Exp $");
 
 /*
  * String functions.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index d29f83246f2e..81ee1de3a92c 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/mystring.h,v 1.7 2002/02/02 06:50:47 imp Exp $
  */
 
 #include <string.h>
diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat
index 631961337e0a..994b405bb9e0 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/nodes.c.pat,v 1.14 2003/07/05 15:18:44 dds Exp $
  */
 
 #include <sys/param.h>
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index 27fbcd171a04..ae3b5b394ef5 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -34,7 +34,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nodetypes	8.2 (Berkeley) 5/4/95
-# $FreeBSD$
+# $FreeBSD: src/bin/sh/nodetypes,v 1.8 2002/05/19 06:03:05 tjr 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 54fdd72c6514..473090086b76 100644
--- a/bin/sh/options.c
+++ b/bin/sh/options.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.20 2002/06/30 05:15:04 obrien Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/options.h b/bin/sh/options.h
index 5aec64e245d9..c66a412c43bf 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/options.h,v 1.12 2002/07/25 10:57:39 tjr Exp $
  */
 
 struct shparam {
diff --git a/bin/sh/output.c b/bin/sh/output.c
index f332106ac4a9..192986b792bd 100644
--- a/bin/sh/output.c
+++ b/bin/sh/output.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)output.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.18 2003/07/05 15:18:44 dds Exp $");
 
 /*
  * Shell output routines.  We use our own output routines because:
diff --git a/bin/sh/output.h b/bin/sh/output.h
index cc08526c317e..8e5dd6aca4fe 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/output.h,v 1.12 2002/06/04 13:13:54 tjr Exp $
  */
 
 #ifndef OUTPUT_INCL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index da166e6503ba..a1fdc77b4ae1 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.49 2003/07/05 15:18:44 dds Exp $");
 
 #include <stdlib.h>
 
diff --git a/bin/sh/parser.h b/bin/sh/parser.h
index c83d66a9decf..e6e439714a7c 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/parser.h,v 1.9 2002/02/02 06:50:47 imp Exp $
  */
 
 /* control characters in argument strings */
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 547cdcc4ac6b..42a3f945a7a9 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)redir.c	8.2 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.24 2003/07/05 15:18:44 dds Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/bin/sh/redir.h b/bin/sh/redir.h
index e786004d7cf3..5cdb677a7896 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/redir.h,v 1.8 2002/02/02 06:50:47 imp Exp $
  */
 
 /* flags passed to redirect */
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index 802856a6787c..0ae58ce1beb1 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
-.\" $FreeBSD$
+.\" $FreeBSD: src/bin/sh/sh.1,v 1.88 2003/09/08 19:57:13 ru Exp $
 .\"
 .Dd April 12, 2003
 .Dt SH 1
diff --git a/bin/sh/shell.h b/bin/sh/shell.h
index f6d8cb75724f..d03bbbdad88c 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/shell.h,v 1.16 2003/09/04 18:28:42 schweikh Exp $
  */
 
 /*
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 7f19a51d6e74..911c2305c16d 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/show.c,v 1.20 2003/01/21 10:06:04 tjr Exp $");
 
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/bin/sh/show.h b/bin/sh/show.h
index edd43096a06c..e5df7b829af7 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/show.h,v 1.10 2002/02/02 06:50:47 imp Exp $
  */
 
 void showtree(union node *);
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index f848ee122b26..d56fcb20e71c 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)trap.c	8.5 (Berkeley) 6/5/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.25 2002/07/24 02:06:07 tjr Exp $");
 
 #include <signal.h>
 #include <unistd.h>
diff --git a/bin/sh/trap.h b/bin/sh/trap.h
index 557840160f1f..06334ee403d3 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/trap.h,v 1.11 2002/07/24 02:06:07 tjr Exp $
  */
 
 extern int pendingsigs;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 7ef73f16eb05..2803614fbc0c 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.25 2003/07/05 15:18:44 dds Exp $");
 
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/bin/sh/var.h b/bin/sh/var.h
index f2365aafd06d..a5573a9554fb 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
- * $FreeBSD$
+ * $FreeBSD: src/bin/sh/var.h,v 1.11 2002/10/01 00:54:14 tjr Exp $
  */
 
 /*