sync with openbsd: only the RCS IDs, because the changed code in
question either does not exist in mksh (lex.c) or refers to the only “feature” we do not pull, GNU bash-like $PS1 (main.c)
This commit is contained in:
parent
b8980a59c1
commit
08624e7e49
4
lex.c
4
lex.c
@ -1,8 +1,8 @@
|
||||
/* $OpenBSD: lex.c,v 1.43 2007/06/02 16:40:59 moritz Exp $ */
|
||||
/* $OpenBSD: lex.c,v 1.44 2008/07/03 17:52:08 otto Exp $ */
|
||||
|
||||
#include "sh.h"
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.62 2008/06/28 22:51:54 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.63 2008/07/08 22:28:25 tg Exp $");
|
||||
|
||||
/*
|
||||
* states while lexing word
|
||||
|
4
main.c
4
main.c
@ -1,4 +1,4 @@
|
||||
/* $OpenBSD: main.c,v 1.43 2007/05/31 20:47:44 otto Exp $ */
|
||||
/* $OpenBSD: main.c,v 1.44 2008/07/05 07:25:18 djm Exp $ */
|
||||
/* $OpenBSD: tty.c,v 1.9 2006/03/14 22:08:01 deraadt Exp $ */
|
||||
/* $OpenBSD: io.c,v 1.22 2006/03/17 16:30:13 millert Exp $ */
|
||||
/* $OpenBSD: table.c,v 1.12 2005/12/11 20:31:21 otto Exp $ */
|
||||
@ -13,7 +13,7 @@
|
||||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.98 2008/05/17 18:47:00 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.99 2008/07/08 22:28:26 tg Exp $");
|
||||
|
||||
extern char **environ;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user