finish un-OS/2-ing and un-pdksh a bit
This commit is contained in:
tg
parent
c34add61ff
commit
27aff60a34
9
emacs.c
9
emacs.c
@ -1,4 +1,4 @@
|
||||
/** $MirBSD: src/bin/ksh/emacs.c,v 2.2 2004/12/13 19:05:09 tg Exp $ */
|
||||
/** $MirBSD: src/bin/ksh/emacs.c,v 2.3 2004/12/13 19:09:06 tg Exp $ */
|
||||
/* $OpenBSD: emacs.c,v 1.28 2003/10/22 07:40:38 jmc Exp $ */
|
||||
|
||||
/*
|
||||
@ -19,7 +19,7 @@
|
||||
#include <locale.h>
|
||||
#include "edit.h"
|
||||
|
||||
__RCSID("$MirBSD: src/bin/ksh/emacs.c,v 2.2 2004/12/13 19:05:09 tg Exp $");
|
||||
__RCSID("$MirBSD: src/bin/ksh/emacs.c,v 2.3 2004/12/13 19:09:06 tg Exp $");
|
||||
|
||||
static Area aedit;
|
||||
#define AEDIT &aedit /* area for kill ring and macro defns */
|
||||
@ -216,11 +216,6 @@ static const struct x_ftab x_ftab[] = {
|
||||
#else
|
||||
{ 0, 0, 0 },
|
||||
#endif
|
||||
#ifdef OS2
|
||||
{ x_meta3, "prefix-3", XF_PREFIX },
|
||||
#else
|
||||
{ 0, 0, 0 },
|
||||
#endif
|
||||
/* @END-FUNC-TAB@ */
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/** $MirBSD: src/bin/ksh/history.c,v 2.2 2004/12/13 19:05:09 tg Exp $ */
|
||||
/** $MirBSD: src/bin/ksh/history.c,v 2.3 2004/12/13 19:09:06 tg Exp $ */
|
||||
/* $OpenBSD: history.c,v 1.24 2004/08/03 12:44:59 danh Exp $ */
|
||||
|
||||
/*
|
||||
@ -21,13 +21,13 @@
|
||||
#include "sh.h"
|
||||
#include "ksh_stat.h"
|
||||
|
||||
__RCSID("$MirBSD: src/bin/ksh/history.c,v 2.2 2004/12/13 19:05:09 tg Exp $");
|
||||
__RCSID("$MirBSD: src/bin/ksh/history.c,v 2.3 2004/12/13 19:09:06 tg Exp $");
|
||||
|
||||
#ifdef HISTORY
|
||||
# ifdef EASY_HISTORY
|
||||
|
||||
# ifndef HISTFILE
|
||||
# define HISTFILE ".pdksh_history"
|
||||
# define HISTFILE ".mksh_history"
|
||||
# endif
|
||||
|
||||
# else
|
||||
|
||||
27
ksh.1tbl
27
ksh.1tbl
@ -1,4 +1,4 @@
|
||||
.\" $MirBSD: src/bin/ksh/ksh.1tbl,v 2.2 2004/12/13 18:24:33 tg Exp $
|
||||
.\" $MirBSD: src/bin/ksh/ksh.1tbl,v 2.3 2004/12/13 19:09:06 tg Exp $
|
||||
.\" $OpenBSD: ksh.1tbl,v 1.79 2004/12/04 07:05:13 jaredy Exp $
|
||||
.\" $OpenBSD: sh.1tbl,v 1.53 2004/12/10 01:56:56 jaredy Exp $
|
||||
.\"
|
||||
@ -176,7 +176,7 @@ parameter match the pattern
|
||||
.Dq \&*r\&*sh
|
||||
(e.g.,
|
||||
.Dq rsh ,
|
||||
.Dq rksh ,
|
||||
.Dq rmksh ,
|
||||
.Dq rpdksh ,
|
||||
etc.).
|
||||
The following restrictions come into effect after the shell processes any
|
||||
@ -259,7 +259,7 @@ If the
|
||||
parameter is not set (and not
|
||||
.Dv NULL )
|
||||
and
|
||||
.Nm pdksh
|
||||
.Nm
|
||||
was compiled with the
|
||||
.Dv DEFAULT_ENV
|
||||
macro defined, the file named in that macro is included (after the above
|
||||
@ -1102,9 +1102,7 @@ where
|
||||
is an arithmetic expression.
|
||||
Array indices are currently limited to the range 0 through 4095 (for
|
||||
.Nm mksh )
|
||||
or 1023 (for
|
||||
.Nm pdksh ) ,
|
||||
inclusive.
|
||||
or 1023 (for other korn shells), inclusive.
|
||||
Parameter substitutions take the form
|
||||
.Ic $ Ns Ar name ,
|
||||
.Ic ${ Ns Ar name Ns Ic \&}
|
||||
@ -1862,7 +1860,7 @@ matches all strings (think about it).
|
||||
.El
|
||||
.Pp
|
||||
Note that
|
||||
.Nm pdksh
|
||||
.Nm
|
||||
currently never matches
|
||||
.Dq \&.
|
||||
and
|
||||
@ -1874,11 +1872,6 @@ Bourne
|
||||
and GNU
|
||||
.Xr bash
|
||||
do.
|
||||
For
|
||||
.Nm pdksh ,
|
||||
this may have to change (too bad), but
|
||||
.Nm mksh
|
||||
will not adopt this behaviour.
|
||||
.Pp
|
||||
Note that none of the above pattern elements match either a period
|
||||
.Pq Sq \&.
|
||||
@ -3318,7 +3311,7 @@ If used outside of a function or
|
||||
script, it has the same effect as
|
||||
.Ic exit .
|
||||
Note that
|
||||
.Nm pdksh
|
||||
.Nm
|
||||
treats both profile and
|
||||
.Ev ENV
|
||||
files as
|
||||
@ -3536,7 +3529,7 @@ was set, the vi command-line mode would let the
|
||||
driver do the work until
|
||||
.Tn ESC
|
||||
(^[) was entered.
|
||||
.Nm pdksh
|
||||
.Nm
|
||||
is always in viraw mode.
|
||||
.It Ic vi-esccomplete
|
||||
In vi command-line editing, do command and file name completion when escape
|
||||
@ -4964,8 +4957,8 @@ Command/file name enumeration.
|
||||
List all the commands or files that match the current big-word.
|
||||
.It Ic ^V
|
||||
Display the version of
|
||||
.Nm pdksh ;
|
||||
it is displayed until another key is pressed (this key is ignored).
|
||||
.Nm
|
||||
until another key is pressed (this key is ignored).
|
||||
.It Ic @ Ns Ar c
|
||||
Macro expansion.
|
||||
Execute the commands found in the alias
|
||||
@ -5280,7 +5273,7 @@ domain Korn shell, as delivered with
|
||||
.Sh NOTES
|
||||
.Nm sh
|
||||
is implemented as a run-time option of
|
||||
.Nm pdksh ,
|
||||
.Nm mksh ,
|
||||
with only those
|
||||
.Nm ksh
|
||||
features whose syntax or semantics are incompatible with a traditional Bourne
|
||||
|
||||
6
main.c
6
main.c
@ -1,4 +1,4 @@
|
||||
/** $MirBSD: src/bin/ksh/main.c,v 2.4 2004/12/13 19:05:09 tg Exp $ */
|
||||
/** $MirBSD: src/bin/ksh/main.c,v 2.5 2004/12/13 19:09:06 tg Exp $ */
|
||||
/* $OpenBSD: main.c,v 1.28 2004/08/23 14:56:32 millert Exp $ */
|
||||
|
||||
/*
|
||||
@ -15,7 +15,7 @@
|
||||
* shell version
|
||||
*/
|
||||
|
||||
__RCSID("$MirBSD: src/bin/ksh/main.c,v 2.4 2004/12/13 19:05:09 tg Exp $");
|
||||
__RCSID("$MirBSD: src/bin/ksh/main.c,v 2.5 2004/12/13 19:09:06 tg Exp $");
|
||||
|
||||
static const char version_param[] =
|
||||
#ifdef KSH
|
||||
@ -122,7 +122,7 @@ main(int argc, char *argv[])
|
||||
/* make sure argv[] is sane */
|
||||
if (!*argv) {
|
||||
static const char *empty_argv[] = {
|
||||
"pdksh", (char *) 0
|
||||
"mksh", (char *) 0
|
||||
};
|
||||
|
||||
argv = (char **) empty_argv;
|
||||
|
||||
6
syn.c
6
syn.c
@ -1,4 +1,4 @@
|
||||
/** $MirBSD: src/bin/ksh/syn.c,v 2.1 2004/12/10 18:09:42 tg Exp $ */
|
||||
/** $MirBSD: src/bin/ksh/syn.c,v 2.2 2004/12/13 19:09:06 tg Exp $ */
|
||||
/* $OpenBSD: syn.c,v 1.14 2003/10/22 07:40:38 jmc Exp $ */
|
||||
|
||||
/*
|
||||
@ -8,7 +8,7 @@
|
||||
#include "sh.h"
|
||||
#include "c_test.h"
|
||||
|
||||
__RCSID("$MirBSD: src/bin/ksh/syn.c,v 2.1 2004/12/10 18:09:42 tg Exp $");
|
||||
__RCSID("$MirBSD: src/bin/ksh/syn.c,v 2.2 2004/12/13 19:09:06 tg Exp $");
|
||||
|
||||
struct nesting_state {
|
||||
int start_token; /* token than began nesting (eg, FOR) */
|
||||
@ -537,7 +537,7 @@ function_body(char *name, int ksh_func)
|
||||
|
||||
sname = wdstrip(name);
|
||||
/* Check for valid characters in name. posix and ksh93 say only
|
||||
* allow [a-zA-Z_0-9] but this allows more as old pdksh's have
|
||||
* allow [a-zA-Z_0-9] but this allows more as old pdkshs have
|
||||
* allowed more (the following were never allowed:
|
||||
* nul space nl tab $ ' " \ ` ( ) & | ; = < >
|
||||
* C_QUOTE covers all but = and adds # [ ? *)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user