* only have one $MirOS RCS ID per file to shrink source size
(this is an exception from normal use) * bump to R26
This commit is contained in:
		
							
								
								
									
										3
									
								
								alloc.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								alloc.c
									
									
									
									
									
								
							| @@ -1,4 +1,3 @@ | |||||||
| /**	$MirOS: src/bin/mksh/alloc.c,v 1.2 2005/06/08 21:51:20 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: alloc.c,v 1.7 2004/02/19 18:51:17 deraadt Exp $	*/ | /*	$OpenBSD: alloc.c,v 1.7 2004/02/19 18:51:17 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| /*- | /*- | ||||||
| @@ -30,7 +29,7 @@ | |||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/alloc.c,v 1.2 2005/06/08 21:51:20 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/alloc.c,v 1.3 2005/11/22 18:40:40 tg Exp $"); | ||||||
|  |  | ||||||
| struct link { | struct link { | ||||||
| 	struct link *prev; | 	struct link *prev; | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								check.t
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								check.t
									
									
									
									
									
								
							| @@ -1,4 +1,4 @@ | |||||||
| # $MirOS: src/bin/mksh/check.t,v 1.35 2005/11/22 18:36:19 tg Exp $ | # $MirOS: src/bin/mksh/check.t,v 1.36 2005/11/22 18:40:40 tg Exp $ | ||||||
| # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ | # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ | ||||||
| # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ | # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ | ||||||
| # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ | # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ | ||||||
| @@ -3736,5 +3736,5 @@ category: pdksh | |||||||
| stdin: | stdin: | ||||||
| 	echo $KSH_VERSION | 	echo $KSH_VERSION | ||||||
| expected-stdout: | expected-stdout: | ||||||
| 	@(#)MIRBSD KSH R25 2005/10/25 | 	@(#)MIRBSD KSH R26 2005/11/22 | ||||||
| --- | --- | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								edit.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								edit.c
									
									
									
									
									
								
							| @@ -1,4 +1,3 @@ | |||||||
| /**	$MirOS: src/bin/mksh/edit.c,v 1.16 2005/10/25 19:53:26 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: edit.c,v 1.30 2005/09/11 18:08:47 otto Exp $	*/ | /*	$OpenBSD: edit.c,v 1.30 2005/09/11 18:08:47 otto Exp $	*/ | ||||||
| /*	$OpenBSD: edit.h,v 1.8 2005/03/28 21:28:22 deraadt Exp $	*/ | /*	$OpenBSD: edit.h,v 1.8 2005/03/28 21:28:22 deraadt Exp $	*/ | ||||||
| /*	$OpenBSD: emacs.c,v 1.39 2005/09/26 19:25:22 otto Exp $	*/ | /*	$OpenBSD: emacs.c,v 1.39 2005/09/26 19:25:22 otto Exp $	*/ | ||||||
| @@ -6,7 +5,7 @@ | |||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.16 2005/10/25 19:53:26 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.17 2005/11/22 18:40:41 tg Exp $"); | ||||||
|  |  | ||||||
| /* tty driver characters we are interested in */ | /* tty driver characters we are interested in */ | ||||||
| typedef struct { | typedef struct { | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								eval.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								eval.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/eval.c,v 1.8 2005/10/25 19:53:27 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: eval.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: eval.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.8 2005/10/25 19:53:27 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.9 2005/11/22 18:40:41 tg Exp $"); | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * string expansion |  * string expansion | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								exec.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								exec.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/exec.c,v 1.11 2005/11/22 18:36:19 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: exec.c,v 1.42 2005/09/11 18:02:27 otto Exp $	*/ | /*	$OpenBSD: exec.c,v 1.42 2005/09/11 18:02:27 otto Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/exec.c,v 1.11 2005/11/22 18:36:19 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/exec.c,v 1.12 2005/11/22 18:40:41 tg Exp $"); | ||||||
|  |  | ||||||
| static int	comexec(struct op *, struct tbl *volatile, char **, | static int	comexec(struct op *, struct tbl *volatile, char **, | ||||||
| 		    int volatile); | 		    int volatile); | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								expr.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								expr.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/expr.c,v 1.2 2005/10/25 19:53:27 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: expr.c,v 1.18 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: expr.c,v 1.18 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/expr.c,v 1.2 2005/10/25 19:53:27 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/expr.c,v 1.3 2005/11/22 18:40:42 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 { | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								funcs.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								funcs.c
									
									
									
									
									
								
							| @@ -1,4 +1,3 @@ | |||||||
| /**	$MirOS: src/bin/mksh/funcs.c,v 1.23 2005/10/25 19:53:27 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: c_ksh.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: c_ksh.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| /*	$OpenBSD: c_sh.c,v 1.31 2005/10/08 18:07:31 otto Exp $	*/ | /*	$OpenBSD: c_sh.c,v 1.31 2005/10/08 18:07:31 otto Exp $	*/ | ||||||
| /*	$OpenBSD: c_test.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: c_test.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| @@ -6,7 +5,7 @@ | |||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.23 2005/10/25 19:53:27 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.24 2005/11/22 18:40:42 tg Exp $"); | ||||||
|  |  | ||||||
| int | int | ||||||
| c_cd(char **wp) | c_cd(char **wp) | ||||||
|   | |||||||
| @@ -1,10 +1,9 @@ | |||||||
| /**	$MirOS: src/bin/mksh/histrap.c,v 1.12 2005/10/25 19:53:28 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: history.c,v 1.31 2005/07/31 16:12:52 espie Exp $	*/ | /*	$OpenBSD: history.c,v 1.31 2005/07/31 16:12:52 espie Exp $	*/ | ||||||
| /*	$OpenBSD: trap.c,v 1.22 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: trap.c,v 1.22 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.12 2005/10/25 19:53:28 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.13 2005/11/22 18:40:42 tg Exp $"); | ||||||
|  |  | ||||||
| static int	histfd; | static int	histfd; | ||||||
| static int	hsize; | static int	hsize; | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								jobs.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								jobs.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/jobs.c,v 1.5 2005/10/25 19:53:28 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: jobs.c,v 1.34 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: jobs.c,v 1.34 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.5 2005/10/25 19:53:28 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/jobs.c,v 1.6 2005/11/22 18:40:42 tg Exp $"); | ||||||
|  |  | ||||||
| /* Order important! */ | /* Order important! */ | ||||||
| #define PRUNNING	0 | #define PRUNNING	0 | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								lex.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								lex.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/lex.c,v 1.9 2005/11/22 18:36:19 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: lex.c,v 1.37 2005/09/11 18:02:27 otto Exp $	*/ | /*	$OpenBSD: lex.c,v 1.37 2005/09/11 18:02:27 otto Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.9 2005/11/22 18:36:19 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.10 2005/11/22 18:40:43 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. */ | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								main.c
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								main.c
									
									
									
									
									
								
							| @@ -1,4 +1,3 @@ | |||||||
| /**	$MirOS: src/bin/mksh/main.c,v 1.30 2005/10/25 21:11:26 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: main.c,v 1.38 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: main.c,v 1.38 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| /*	$OpenBSD: tty.c,v 1.8 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: tty.c,v 1.8 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| /*	$OpenBSD: io.c,v 1.21 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: io.c,v 1.21 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| @@ -7,9 +6,9 @@ | |||||||
| #define	EXTERN				/* define EXTERNs in sh.h */ | #define	EXTERN				/* define EXTERNs in sh.h */ | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/main.c,v 1.30 2005/10/25 21:11:26 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/main.c,v 1.31 2005/11/22 18:40:43 tg Exp $"); | ||||||
|  |  | ||||||
| #define	MKSH_VERSION	"@(#)MIRBSD KSH R25 2005/10/25" | #define	MKSH_VERSION	"@(#)MIRBSD KSH R26 2005/11/22" | ||||||
|  |  | ||||||
| extern char **environ; | extern char **environ; | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								misc.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								misc.c
									
									
									
									
									
								
							| @@ -1,10 +1,10 @@ | |||||||
| /**	$MirOS: src/bin/mksh/misc.c,v 1.8 2005/10/25 19:53:28 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: misc.c,v 1.28 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: misc.c,v 1.28 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| /*	$OpenBSD: path.c,v 1.12 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: path.c,v 1.12 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.8 2005/10/25 19:53:28 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.9 2005/11/22 18:40:43 tg Exp $" | ||||||
|  | 	"\n" MKSH_SH_H_ID); | ||||||
|  |  | ||||||
| short chtypes[UCHAR_MAX+1];	/* type bits for unsigned char */ | short chtypes[UCHAR_MAX+1];	/* type bits for unsigned char */ | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								sh.h
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								sh.h
									
									
									
									
									
								
							| @@ -1,4 +1,3 @@ | |||||||
| /**	$MirOS: src/bin/mksh/sh.h,v 1.22 2005/11/22 18:36:20 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: sh.h,v 1.28 2005/10/04 20:35:11 otto Exp $	*/ | /*	$OpenBSD: sh.h,v 1.28 2005/10/04 20:35:11 otto Exp $	*/ | ||||||
| /*	$OpenBSD: shf.h,v 1.5 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: shf.h,v 1.5 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
| /*	$OpenBSD: table.h,v 1.6 2004/12/18 20:55:52 millert Exp $	*/ | /*	$OpenBSD: table.h,v 1.6 2004/12/18 20:55:52 millert Exp $	*/ | ||||||
| @@ -9,6 +8,8 @@ | |||||||
| /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/ | /*	$OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $	*/ | ||||||
| /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/ | /*	$OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $	*/ | ||||||
|  |  | ||||||
|  | #define	MKSH_SH_H_ID	"$MirOS: src/bin/mksh/sh.h,v 1.23 2005/11/22 18:40:43 tg Exp $" | ||||||
|  |  | ||||||
| #if defined(__INTERIX) && !defined(_ALL_SOURCE) | #if defined(__INTERIX) && !defined(_ALL_SOURCE) | ||||||
| #define _ALL_SOURCE | #define _ALL_SOURCE | ||||||
| #endif | #endif | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								shf.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								shf.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/shf.c,v 1.2 2005/10/25 19:53:29 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: shf.c,v 1.13 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: shf.c,v 1.13 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/shf.c,v 1.2 2005/10/25 19:53:29 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/shf.c,v 1.3 2005/11/22 18:40:43 tg Exp $"); | ||||||
|  |  | ||||||
| /* flags to shf_emptybuf() */ | /* flags to shf_emptybuf() */ | ||||||
| #define EB_READSW	0x01	/* about to switch to reading */ | #define EB_READSW	0x01	/* about to switch to reading */ | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								syn.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								syn.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/syn.c,v 1.3 2005/10/08 19:31:00 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: syn.c,v 1.22 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: syn.c,v 1.22 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/syn.c,v 1.3 2005/10/08 19:31:00 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/syn.c,v 1.4 2005/11/22 18:40:44 tg Exp $"); | ||||||
|  |  | ||||||
| struct nesting_state { | struct nesting_state { | ||||||
| 	int	start_token;	/* token than began nesting (eg, FOR) */ | 	int	start_token;	/* token than began nesting (eg, FOR) */ | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								tree.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								tree.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/tree.c,v 1.2 2005/06/08 22:34:03 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: tree.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $	*/ | /*	$OpenBSD: tree.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/tree.c,v 1.2 2005/06/08 22:34:03 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/tree.c,v 1.3 2005/11/22 18:40:44 tg Exp $"); | ||||||
|  |  | ||||||
| #define INDENT	4 | #define INDENT	4 | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								var.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								var.c
									
									
									
									
									
								
							| @@ -1,9 +1,8 @@ | |||||||
| /**	$MirOS: src/bin/mksh/var.c,v 1.11 2005/10/29 07:55:51 tg Exp $ */ |  | ||||||
| /*	$OpenBSD: var.c,v 1.27 2005/10/08 18:02:59 otto Exp $	*/ | /*	$OpenBSD: var.c,v 1.27 2005/10/08 18:02:59 otto Exp $	*/ | ||||||
|  |  | ||||||
| #include "sh.h" | #include "sh.h" | ||||||
|  |  | ||||||
| __RCSID("$MirOS: src/bin/mksh/var.c,v 1.11 2005/10/29 07:55:51 tg Exp $"); | __RCSID("$MirOS: src/bin/mksh/var.c,v 1.12 2005/11/22 18:40:44 tg Exp $"); | ||||||
|  |  | ||||||
| /* | /* | ||||||
|  * Variables |  * Variables | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user