From e824f36ff01d5699ae47ace1fd460230ad9a3ab4 Mon Sep 17 00:00:00 2001
From: tg <tg@mirbsd.org>
Date: Tue, 28 Dec 2004 22:40:40 +0000
Subject: [PATCH] catch up with diffs/fixed we already had From: Otto Moerbeek
 <otto@cvs.openbsd.org>

---
 c_sh.c  | 6 +++---
 eval.c  | 6 +++---
 exec.c  | 6 +++---
 expr.c  | 6 +++---
 lex.c   | 6 +++---
 main.c  | 6 +++---
 proto.h | 4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/c_sh.c b/c_sh.c
index 006a0bd..595fc67 100644
--- a/c_sh.c
+++ b/c_sh.c
@@ -1,5 +1,5 @@
-/**	$MirBSD: src/bin/ksh/c_sh.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */
-/*	$OpenBSD: c_sh.c,v 1.22 2004/12/19 01:58:04 millert Exp $	*/
+/**	$MirBSD: src/bin/ksh/c_sh.c,v 2.8 2004/12/28 22:40:39 tg Exp $ */
+/*	$OpenBSD: c_sh.c,v 1.26 2004/12/22 18:57:28 otto Exp $	*/
 
 /*
  * built-in Bourne commands
@@ -10,7 +10,7 @@
 #include "ksh_time.h"
 #include "ksh_times.h"
 
-__RCSID("$MirBSD: src/bin/ksh/c_sh.c,v 2.7 2004/12/28 22:32:08 tg Exp $");
+__RCSID("$MirBSD: src/bin/ksh/c_sh.c,v 2.8 2004/12/28 22:40:39 tg Exp $");
 
 static	char *clocktos(clock_t t);
 
diff --git a/eval.c b/eval.c
index 23361bb..38fcb08 100644
--- a/eval.c
+++ b/eval.c
@@ -1,5 +1,5 @@
-/**	$MirBSD: src/bin/ksh/eval.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */
-/*	$OpenBSD: eval.c,v 1.18 2004/12/13 16:37:06 millert Exp $	*/
+/**	$MirBSD: src/bin/ksh/eval.c,v 2.8 2004/12/28 22:40:39 tg Exp $ */
+/*	$OpenBSD: eval.c,v 1.24 2004/12/22 18:52:37 millert Exp $	*/
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -10,7 +10,7 @@
 #include "ksh_dir.h"
 #include "ksh_stat.h"
 
-__RCSID("$MirBSD: src/bin/ksh/eval.c,v 2.7 2004/12/28 22:32:08 tg Exp $");
+__RCSID("$MirBSD: src/bin/ksh/eval.c,v 2.8 2004/12/28 22:40:39 tg Exp $");
 
 /*
  * string expansion
diff --git a/exec.c b/exec.c
index 537453e..32e8794 100644
--- a/exec.c
+++ b/exec.c
@@ -1,5 +1,5 @@
-/**	$MirBSD: src/bin/ksh/exec.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */
-/*	$OpenBSD: exec.c,v 1.31 2003/12/15 05:25:52 otto Exp $	*/
+/**	$MirBSD: src/bin/ksh/exec.c,v 2.8 2004/12/28 22:40:40 tg Exp $ */
+/*	$OpenBSD: exec.c,v 1.39 2004/12/22 18:57:28 otto Exp $	*/
 
 /*
  * execute command tree
@@ -10,7 +10,7 @@
 #include <ctype.h>
 #include "ksh_stat.h"
 
-__RCSID("$MirBSD: src/bin/ksh/exec.c,v 2.7 2004/12/28 22:32:08 tg Exp $");
+__RCSID("$MirBSD: src/bin/ksh/exec.c,v 2.8 2004/12/28 22:40:40 tg Exp $");
 
 static int	comexec(struct op *t, struct tbl *volatile tp, char **ap,
 			      int volatile flags);
diff --git a/expr.c b/expr.c
index 8c74a84..cad6456 100644
--- a/expr.c
+++ b/expr.c
@@ -1,5 +1,5 @@
-/**	$MirBSD: src/bin/ksh/expr.c,v 2.5 2004/12/28 22:32:08 tg Exp $ */
-/*	$OpenBSD: expr.c,v 1.9 2003/10/22 07:40:38 jmc Exp $	*/
+/**	$MirBSD: src/bin/ksh/expr.c,v 2.6 2004/12/28 22:40:40 tg Exp $ */
+/*	$OpenBSD: expr.c,v 1.16 2004/12/22 18:57:28 otto Exp $	*/
 
 /*
  * Korn expression evaluation
@@ -8,7 +8,7 @@
 #include "sh.h"
 #include <ctype.h>
 
-__RCSID("$MirBSD: src/bin/ksh/expr.c,v 2.5 2004/12/28 22:32:08 tg Exp $");
+__RCSID("$MirBSD: src/bin/ksh/expr.c,v 2.6 2004/12/28 22:40:40 tg Exp $");
 
 /* The order of these enums is constrained by the order of opinfo[] */
 enum token {
diff --git a/lex.c b/lex.c
index fbedd48..2388dad 100644
--- a/lex.c
+++ b/lex.c
@@ -1,5 +1,5 @@
-/**	$MirBSD: src/bin/ksh/lex.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */
-/*	$OpenBSD: lex.c,v 1.18 2003/08/06 21:08:05 millert Exp $	*/
+/**	$MirBSD: src/bin/ksh/lex.c,v 2.8 2004/12/28 22:40:40 tg Exp $ */
+/*	$OpenBSD: lex.c,v 1.30 2004/12/22 18:57:28 otto Exp $	*/
 
 /*
  * lexical analysis and source input
@@ -8,7 +8,7 @@
 #include "sh.h"
 #include <ctype.h>
 
-__RCSID("$MirBSD: src/bin/ksh/lex.c,v 2.7 2004/12/28 22:32:08 tg Exp $");
+__RCSID("$MirBSD: src/bin/ksh/lex.c,v 2.8 2004/12/28 22:40:40 tg Exp $");
 
 /* Structure to keep track of the lexing state and the various pieces of info
  * needed for each particular state.
diff --git a/main.c b/main.c
index 1e65e87..0209a11 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
-/**	$MirBSD: src/bin/ksh/main.c,v 2.12 2004/12/28 22:32:08 tg Exp $ */
-/*	$OpenBSD: main.c,v 1.28 2004/08/23 14:56:32 millert Exp $	*/
+/**	$MirBSD: src/bin/ksh/main.c,v 2.13 2004/12/28 22:40:40 tg Exp $ */
+/*	$OpenBSD: main.c,v 1.35 2004/12/22 18:57:28 otto Exp $	*/
 
 /*
  * startup, main loop, environments and error handling
@@ -15,7 +15,7 @@
  * shell version
  */
 
-__RCSID("$MirBSD: src/bin/ksh/main.c,v 2.12 2004/12/28 22:32:08 tg Exp $");
+__RCSID("$MirBSD: src/bin/ksh/main.c,v 2.13 2004/12/28 22:40:40 tg Exp $");
 
 const char ksh_version[] =
 	"@(#)PD KSH v5.2.14 MirOS R20 in "
diff --git a/proto.h b/proto.h
index 2756ca5..cc61009 100644
--- a/proto.h
+++ b/proto.h
@@ -1,9 +1,9 @@
-/**	$MirBSD: src/bin/ksh/proto.h,v 2.7 2004/12/28 22:33:21 tg Exp $ */
+/**	$MirBSD: src/bin/ksh/proto.h,v 2.8 2004/12/28 22:40:40 tg Exp $ */
 /*	$OpenBSD: proto.h,v 1.11 2003/05/16 19:58:57 jsyn Exp $	*/
 /*	$From: proto.h,v 1.3 1994/05/19 18:32:40 michael Exp michael $ */
 
 #ifndef PROTO_H
-#define PROTO_H
+/*	$OpenBSD: proto.h,v 1.23 2004/12/22 18:57:28 otto Exp $	*/
 
 /*
  * prototypes for PD-KSH