catch up with diffs/fixed we already had
From: Otto Moerbeek <otto@cvs.openbsd.org>
This commit is contained in:
		
							
								
								
									
										6
									
								
								c_sh.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								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 $ */ | /**	$MirBSD: src/bin/ksh/c_sh.c,v 2.8 2004/12/28 22:40:39 tg Exp $ */ | ||||||
| /*	$OpenBSD: c_sh.c,v 1.22 2004/12/19 01:58:04 millert Exp $	*/ | /*	$OpenBSD: c_sh.c,v 1.26 2004/12/22 18:57:28 otto Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * built-in Bourne commands |  * built-in Bourne commands | ||||||
| @@ -10,7 +10,7 @@ | |||||||
| #include "ksh_time.h" | #include "ksh_time.h" | ||||||
| #include "ksh_times.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); | static	char *clocktos(clock_t t); | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								eval.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								eval.c
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| /**	$MirBSD: src/bin/ksh/eval.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */ | /**	$MirBSD: src/bin/ksh/eval.c,v 2.8 2004/12/28 22:40:39 tg Exp $ */ | ||||||
| /*	$OpenBSD: eval.c,v 1.18 2004/12/13 16:37:06 millert Exp $	*/ | /*	$OpenBSD: eval.c,v 1.24 2004/12/22 18:52:37 millert Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Expansion - quoting, separation, substitution, globbing |  * Expansion - quoting, separation, substitution, globbing | ||||||
| @@ -10,7 +10,7 @@ | |||||||
| #include "ksh_dir.h" | #include "ksh_dir.h" | ||||||
| #include "ksh_stat.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 |  * string expansion | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								exec.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								exec.c
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| /**	$MirBSD: src/bin/ksh/exec.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */ | /**	$MirBSD: src/bin/ksh/exec.c,v 2.8 2004/12/28 22:40:40 tg Exp $ */ | ||||||
| /*	$OpenBSD: exec.c,v 1.31 2003/12/15 05:25:52 otto Exp $	*/ | /*	$OpenBSD: exec.c,v 1.39 2004/12/22 18:57:28 otto Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * execute command tree |  * execute command tree | ||||||
| @@ -10,7 +10,7 @@ | |||||||
| #include <ctype.h> | #include <ctype.h> | ||||||
| #include "ksh_stat.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, | static int	comexec(struct op *t, struct tbl *volatile tp, char **ap, | ||||||
| 			      int volatile flags); | 			      int volatile flags); | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								expr.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								expr.c
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| /**	$MirBSD: src/bin/ksh/expr.c,v 2.5 2004/12/28 22:32:08 tg Exp $ */ | /**	$MirBSD: src/bin/ksh/expr.c,v 2.6 2004/12/28 22:40:40 tg Exp $ */ | ||||||
| /*	$OpenBSD: expr.c,v 1.9 2003/10/22 07:40:38 jmc Exp $	*/ | /*	$OpenBSD: expr.c,v 1.16 2004/12/22 18:57:28 otto Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Korn expression evaluation |  * Korn expression evaluation | ||||||
| @@ -8,7 +8,7 @@ | |||||||
| #include "sh.h" | #include "sh.h" | ||||||
| #include <ctype.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[] */ | /* The order of these enums is constrained by the order of opinfo[] */ | ||||||
| enum token { | enum token { | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								lex.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								lex.c
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| /**	$MirBSD: src/bin/ksh/lex.c,v 2.7 2004/12/28 22:32:08 tg Exp $ */ | /**	$MirBSD: src/bin/ksh/lex.c,v 2.8 2004/12/28 22:40:40 tg Exp $ */ | ||||||
| /*	$OpenBSD: lex.c,v 1.18 2003/08/06 21:08:05 millert Exp $	*/ | /*	$OpenBSD: lex.c,v 1.30 2004/12/22 18:57:28 otto Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * lexical analysis and source input |  * lexical analysis and source input | ||||||
| @@ -8,7 +8,7 @@ | |||||||
| #include "sh.h" | #include "sh.h" | ||||||
| #include <ctype.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 | /* Structure to keep track of the lexing state and the various pieces of info | ||||||
|  * needed for each particular state. |  * needed for each particular state. | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								main.c
									
									
									
									
									
								
							| @@ -1,5 +1,5 @@ | |||||||
| /**	$MirBSD: src/bin/ksh/main.c,v 2.12 2004/12/28 22:32:08 tg Exp $ */ | /**	$MirBSD: src/bin/ksh/main.c,v 2.13 2004/12/28 22:40:40 tg Exp $ */ | ||||||
| /*	$OpenBSD: main.c,v 1.28 2004/08/23 14:56:32 millert Exp $	*/ | /*	$OpenBSD: main.c,v 1.35 2004/12/22 18:57:28 otto Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * startup, main loop, environments and error handling |  * startup, main loop, environments and error handling | ||||||
| @@ -15,7 +15,7 @@ | |||||||
|  * shell version |  * 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[] = | const char ksh_version[] = | ||||||
| 	"@(#)PD KSH v5.2.14 MirOS R20 in " | 	"@(#)PD KSH v5.2.14 MirOS R20 in " | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								proto.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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 $	*/ | /*	$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 $ */ | /*	$From: proto.h,v 1.3 1994/05/19 18:32:40 michael Exp michael $ */ | ||||||
|  |  | ||||||
| #ifndef PROTO_H | #ifndef PROTO_H | ||||||
| #define PROTO_H | /*	$OpenBSD: proto.h,v 1.23 2004/12/22 18:57:28 otto Exp $	*/ | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * prototypes for PD-KSH |  * prototypes for PD-KSH | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user