JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import OpenBSD as of today again (seems pretty stable, I hope)

Browse Source 
Prominent changes: more bgpd, tcpmd5; tcpdump/isakmpd fixes
This commit is contained in:
tg
2004-01-26 16:55:10 +00:00
parent e496d7be6e
commit cd4db2e965
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2003/08/11 09:41:31 miod Exp $ # $OpenBSD: Makefile,v 1.16 2004/01/09 17:10:07 brad Exp $
PROG= ksh PROG= ksh
SRCS= alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c \ SRCS= alloc.c c_ksh.c c_sh.c c_test.c c_ulimit.c edit.c emacs.c \
@ -21,7 +21,7 @@ MLINKS= ksh.1 rksh.1 ksh.1 ulimit.1
siglist.out: config.h sh.h siglist.in siglist.sh siglist.out: config.h sh.h siglist.in siglist.sh
/bin/sh ${.CURDIR}/siglist.sh \ /bin/sh ${.CURDIR}/siglist.sh \
"${CPP} ${CPPFLAGS} ${DEFS} -I${.CURDIR}" \ "${CC} -E ${CPPFLAGS} ${DEFS} -I${.CURDIR}" \
< ${.CURDIR}/siglist.in > siglist.out < ${.CURDIR}/siglist.in > siglist.out
emacs.out: emacs.c emacs.out: emacs.c

40
ksh.1tbl
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ksh.1tbl,v 1.63 2003/12/27 20:35:12 jmc Exp $ .\" $OpenBSD: ksh.1tbl,v 1.65 2004/01/23 23:08:45 jmc Exp $
.\" .\"
.\" Copyright (c) 1980, 1990, 1993 .\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved. .\" The Regents of the University of California. All rights reserved.
@ -561,7 +561,7 @@ if no
.Ar list .Ar list
is executed, the exit status is zero. is executed, the exit status is zero.
.It Xo Ic for Ar name No [ .It Xo Ic for Ar name No [
.Ic in Ar word Ar ... term Ns No ] .Ic in Ar word Ar ... term Ns ]
.Ic do Ar list Ic done .Ic do Ar list Ic done
.Xc .Xc
For each For each
@ -622,7 +622,7 @@ that is executed; if no non-conditional
.Ar list .Ar list
is executed, the exit status is zero. is executed, the exit status is zero.
.It Xo Ic select Ar name No [ .It Xo Ic select Ar name No [
.Ic in Ar word Ar ... term Ns No ] .Ic in Ar word Ar ... term Ns ]
.Ic do Ar list Ic done .Ic do Ar list Ic done
.Xc .Xc
The The
@ -1103,7 +1103,7 @@ Lastly, parameters can be assigned values using assignment operators
inside arithmetic expressions (see inside arithmetic expressions (see
.Sx Arithmetic expressions .Sx Arithmetic expressions
below) or using the below) or using the
.Xo Ic ${ Ns Ar name Ns No = .Xo Ic ${ Ns Ar name Ns =
.Ns Ar value Ns Ic \&} .Ns Ar value Ns Ic \&}
.Xc .Xc
form of the parameter substitution (see below). form of the parameter substitution (see below).
@ -1116,7 +1116,7 @@ commands, or by parameter assignments followed by simple commands) are put in
the environment (see the environment (see
.Xr environ 7 ) .Xr environ 7 )
of commands run by the shell as of commands run by the shell as
.Ar name Ns No = Ns Ar value .Ar name Ns = Ns Ar value
pairs. pairs.
The order in which parameters appear in the environment of a command is The order in which parameters appear in the environment of a command is
unspecified. unspecified.
@ -1169,7 +1169,7 @@ is set and not
it is substituted; otherwise, it is substituted; otherwise,
.Ar word .Ar word
is printed on standard error (preceded by is printed on standard error (preceded by
.Ar name Ns No \&: ) .Ar name Ns \&: )
and an error occurs (normally causing termination of a shell script, function and an error occurs (normally causing termination of a shell script, function
or .-script). or .-script).
If word is omitted the string If word is omitted the string
@ -1694,7 +1694,7 @@ The pattern elements have the following meaning:
Matches any single character. Matches any single character.
.It Ic \&* .It Ic \&*
Matches any sequence of characters. Matches any sequence of characters.
.It Ic \&[ Ns No .. Ns Ic \&] .It Ic \&[ Ns .. Ns Ic \&]
Matches any of the characters inside the brackets. Matches any of the characters inside the brackets.
Ranges of characters can be Ranges of characters can be
specified by separating two characters by a specified by separating two characters by a
@ -1715,9 +1715,9 @@ Also, a
.Ql \&! .Ql \&!
appearing at the start of the list has special meaning (see below), so to appearing at the start of the list has special meaning (see below), so to
represent itself it must be quoted or appear later in the list. represent itself it must be quoted or appear later in the list.
.It Ic \&[\&! Ns No .. Ns Ic \&] .It Ic \&[\&! Ns .. Ns Ic \&]
Like Like
.Ic \&[ Ns No .. Ns Ic \&] , .Ic \&[ Ns .. Ns Ic \&] ,
except it matches any character not inside the brackets. except it matches any character not inside the brackets.
.Sm off .Sm off
.It Xo Ic \&*( Ar pattern Ic \&| No \ ...\ .It Xo Ic \&*( Ar pattern Ic \&| No \ ...\
@ -1812,7 +1812,7 @@ Note that none of the above pattern elements match either a period
at the start of a file name or a slash at the start of a file name or a slash
.Pq Sq / , .Pq Sq / ,
even if they are explicitly used in a even if they are explicitly used in a
.Ic \&[ Ns No .. Ns Ic \&] .Ic \&[ Ns .. Ns Ic \&]
sequence; also, the names sequence; also, the names
.Dq \&. .Dq \&.
and and
@ -1831,7 +1831,7 @@ The
character classes (i.e., character classes (i.e.,
.Ic \&[\&: Ns Ar class-name Ns Ic \&:\&] .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&]
inside a inside a
.Ic \&[ Ns No .. Ns Ic \&] .Ic \&[ Ns .. Ns Ic \&]
expression) are not yet implemented. expression) are not yet implemented.
.Ss Input/output redirection .Ss Input/output redirection
When a command is executed, its standard input, standard output, and standard When a command is executed, its standard input, standard output, and standard
@ -1962,7 +1962,7 @@ will print an error with a line number prepended to it.
Integer arithmetic expressions can be used with the Integer arithmetic expressions can be used with the
.Ic let .Ic let
command, inside command, inside
.Ic $(( Ns No .. Ns Ic )) .Ic $(( Ns .. Ns Ic ))
expressions, inside array references (e.g., expressions, inside array references (e.g.,
.Sm off .Sm off
.Ar name Ic \&[ Ar expr Ic \&] ) , .Ar name Ic \&[ Ar expr Ic \&] ) ,
@ -2624,7 +2624,7 @@ above).
.Pp .Pp
When listing aliases, one of two formats is used. When listing aliases, one of two formats is used.
Normally, aliases are listed as Normally, aliases are listed as
.Ar name Ns No = Ns Ar value , .Ar name Ns = Ns Ar value ,
where where
.Ar value .Ar value
is quoted. is quoted.
@ -2913,7 +2913,7 @@ is used), and then executed by the shell.
.It Xo Ic fc .It Xo Ic fc
.Oo Fl e No \&- \&| Fl s Oc .Oo Fl e No \&- \&| Fl s Oc
.Op Fl g .Op Fl g
.Op Ar old Ns No = Ns Ar new .Op Ar old Ns = Ns Ar new
.Op Ar prefix .Op Ar prefix
.Xc .Xc
Re-execute the selected command (the previous command by default) after Re-execute the selected command (the previous command by default) after
@ -3211,14 +3211,14 @@ commands defining all read-only parameters, including their values, are
printed. printed.
.It Ic return Op Ar status .It Ic return Op Ar status
Returns from a function or Returns from a function or
.Ic \&. .Ic .\&
script, with exit status script, with exit status
.Ar status . .Ar status .
If no If no
.Ar status .Ar status
is given, the exit status of the last executed command is used. is given, the exit status of the last executed command is used.
If used outside of a function or If used outside of a function or
.Ic \&. .Ic .\&
script, it has the same effect as script, it has the same effect as
.Ic exit . .Ic exit .
Note that Note that
@ -3226,9 +3226,9 @@ Note that
treats both profile and treats both profile and
.Ev ENV .Ev ENV
files as files as
.Ic \&. .Ic .\&
scripts, while the original Korn shell only treats profiles as cripts, while the original Korn shell only treats profiles as
.Ic \&. .Ic .\&
scripts. scripts.
.It Xo Ic set Op Ic +-abCefhkmnpsuvxX .It Xo Ic set Op Ic +-abCefhkmnpsuvxX
.Op Ic +-o Ar option .Op Ic +-o Ar option
@ -4602,7 +4602,7 @@ commands continue searching backward to the next previous occurrence of the
pattern. pattern.
The history buffer retains only a finite number of lines; the oldest The history buffer retains only a finite number of lines; the oldest
are discarded as necessary. are discarded as necessary.
.It Ic set-mark-command ^[ Ns No <space> .It Ic set-mark-command ^[ Ns <space>
Set the mark at the cursor position. Set the mark at the cursor position.
.It Ic stuff .It Ic stuff
On systems supporting it, pushes the bound character back onto the terminal On systems supporting it, pushes the bound character back onto the terminal

4
main.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: main.c,v 1.25 2003/06/26 00:09:45 deraadt Exp $ */ /* $OpenBSD: main.c,v 1.26 2004/01/08 05:43:14 jmc Exp $ */
/* /*
* startup, main loop, environments and error handling * startup, main loop, environments and error handling
@ -177,7 +177,7 @@ main(int argc, char *argv[])
} }
/* Turn on nohup by default for how - will change to off /* Turn on nohup by default for now - will change to off
* by default once people are aware of its existence * by default once people are aware of its existence
* (at&t ksh does not have a nohup option - it always sends * (at&t ksh does not have a nohup option - it always sends
* the hup). * the hup).

36
sh.1tbl
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sh.1tbl,v 1.42 2003/12/27 20:52:22 jmc Exp $ .\" $OpenBSD: sh.1tbl,v 1.44 2004/01/23 23:08:45 jmc Exp $
.\" .\"
.\" Copyright (c) 1980, 1990, 1993 .\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved. .\" The Regents of the University of California. All rights reserved.
@ -540,7 +540,7 @@ if no
.Ar list .Ar list
is executed, the exit status is zero. is executed, the exit status is zero.
.It Xo Ic for Ar name No [ .It Xo Ic for Ar name No [
.Ic in Ar word Ar ... term Ns No ] .Ic in Ar word Ar ... term Ns ]
.Ic do Ar list Ic done .Ic do Ar list Ic done
.Xc .Xc
For each For each
@ -931,7 +931,7 @@ Lastly, parameters can be assigned values using assignment operators
inside arithmetic expressions (see inside arithmetic expressions (see
.Sx Arithmetic expressions .Sx Arithmetic expressions
below) or using the below) or using the
.Xo Ic ${ Ns Ar name Ns No = .Xo Ic ${ Ns Ar name Ns =
.Ns Ar value Ns Ic \&} .Ns Ar value Ns Ic \&}
.Xc .Xc
form of the parameter substitution (see below). form of the parameter substitution (see below).
@ -944,7 +944,7 @@ commands, or by parameter assignments followed by simple commands) are put in
the environment (see the environment (see
.Xr environ 7 ) .Xr environ 7 )
of commands run by the shell as of commands run by the shell as
.Ar name Ns No = Ns Ar value .Ar name Ns = Ns Ar value
pairs. pairs.
The order in which parameters appear in the environment of a command is The order in which parameters appear in the environment of a command is
unspecified. unspecified.
@ -997,7 +997,7 @@ is set and not
it is substituted; otherwise, it is substituted; otherwise,
.Ar word .Ar word
is printed on standard error (preceded by is printed on standard error (preceded by
.Ar name Ns No \&: ) .Ar name Ns \&: )
and an error occurs (normally causing termination of a shell script, function and an error occurs (normally causing termination of a shell script, function
or .-script). or .-script).
If word is omitted the string If word is omitted the string
@ -1352,7 +1352,7 @@ The pattern elements have the following meaning:
Matches any single character. Matches any single character.
.It Ic \&* .It Ic \&*
Matches any sequence of characters. Matches any sequence of characters.
.It Ic \&[ Ns No .. Ns Ic \&] .It Ic \&[ Ns .. Ns Ic \&]
Matches any of the characters inside the brackets. Matches any of the characters inside the brackets.
Ranges of characters can be Ranges of characters can be
specified by separating two characters by a specified by separating two characters by a
@ -1373,9 +1373,9 @@ Also, a
.Ql \&! .Ql \&!
appearing at the start of the list has special meaning (see below), so to appearing at the start of the list has special meaning (see below), so to
represent itself it must be quoted or appear later in the list. represent itself it must be quoted or appear later in the list.
.It Ic \&[\&! Ns No .. Ns Ic \&] .It Ic \&[\&! Ns .. Ns Ic \&]
Like Like
.Ic \&[ Ns No .. Ns Ic \&] , .Ic \&[ Ns .. Ns Ic \&] ,
except it matches any character not inside the brackets. except it matches any character not inside the brackets.
.Sm on .Sm on
Matches any string of characters that matches zero or more occurrences of the Matches any string of characters that matches zero or more occurrences of the
@ -1466,7 +1466,7 @@ Note that none of the above pattern elements match either a period
at the start of a file name or a slash at the start of a file name or a slash
.Pq Sq / , .Pq Sq / ,
even if they are explicitly used in a even if they are explicitly used in a
.Ic \&[ Ns No .. Ns Ic \&] .Ic \&[ Ns .. Ns Ic \&]
sequence; also, the names sequence; also, the names
.Dq \&. .Dq \&.
and and
@ -1485,7 +1485,7 @@ The
character classes (i.e., character classes (i.e.,
.Ic \&[\&: Ns Ar class-name Ns Ic \&:\&] .Ic \&[\&: Ns Ar class-name Ns Ic \&:\&]
inside a inside a
.Ic \&[ Ns No .. Ns Ic \&] .Ic \&[ Ns .. Ns Ic \&]
expression) are not yet implemented. expression) are not yet implemented.
.Ss Input/output redirection .Ss Input/output redirection
When a command is executed, its standard input, standard output, and standard When a command is executed, its standard input, standard output, and standard
@ -1616,7 +1616,7 @@ will print an error with a line number prepended to it.
Integer arithmetic expressions can be used with the Integer arithmetic expressions can be used with the
.Ic let .Ic let
command, inside command, inside
.Ic $(( Ns No .. Ns Ic )) .Ic $(( Ns .. Ns Ic ))
expressions, inside array references (e.g., expressions, inside array references (e.g.,
.Sm off .Sm off
.Ar name Ic \&[ Ar expr Ic \&] ) , .Ar name Ic \&[ Ar expr Ic \&] ) ,
@ -2217,7 +2217,7 @@ above).
.Pp .Pp
When listing aliases, one of two formats is used. When listing aliases, one of two formats is used.
Normally, aliases are listed as Normally, aliases are listed as
.Ar name Ns No = Ns Ar value , .Ar name Ns = Ns Ar value ,
where where
.Ar value .Ar value
is quoted. is quoted.
@ -2416,7 +2416,7 @@ If no command is given except for I/O redirection, the I/O redirection is
permanent and the shell is permanent and the shell is
not replaced. not replaced.
Any file descriptors which are opened or Any file descriptors which are opened or
.Xr dup 2 Ns No 'd .Xr dup 2 Ns 'd
in this way are made available to other executed commands (note that the Korn in this way are made available to other executed commands (note that the Korn
shell differs here: it does not pass on file descriptors greater than 2). shell differs here: it does not pass on file descriptors greater than 2).
.It Ic exit Op Ar status .It Ic exit Op Ar status
@ -2444,7 +2444,7 @@ A command that exits with a non-zero status.
.It Xo Ic fc .It Xo Ic fc
.Oo Fl e No \&- \&| Fl s Oc .Oo Fl e No \&- \&| Fl s Oc
.Op Fl g .Op Fl g
.Op Ar old Ns No = Ns Ar new .Op Ar old Ns = Ns Ar new
.Op Ar prefix .Op Ar prefix
.Xc .Xc
Re-execute the selected command (the previous command by default) after Re-execute the selected command (the previous command by default) after
@ -2730,14 +2730,14 @@ commands defining all read-only parameters, including their values, are
printed. printed.
.It Ic return Op Ar status .It Ic return Op Ar status
Returns from a function or Returns from a function or
.Ic \&. .Ic .\&
script, with exit status script, with exit status
.Ar status . .Ar status .
If no If no
.Ar status .Ar status
is given, the exit status of the last executed command is used. is given, the exit status of the last executed command is used.
If used outside of a function or If used outside of a function or
.Ic \&. .Ic .\&
script, it has the same effect as script, it has the same effect as
.Ic exit . .Ic exit .
Note that Note that
@ -2745,9 +2745,9 @@ Note that
treats both profile and treats both profile and
.Ev ENV .Ev ENV
files as files as
.Ic \&. .Ic .\&
scripts, while the original Korn shell only treats profiles as scripts, while the original Korn shell only treats profiles as
.Ic \&. .Ic .\&
scripts. scripts.
.It Xo Ic set Op Ic +-abCefhkmnpsuvxX .It Xo Ic set Op Ic +-abCefhkmnpsuvxX
.Op Ic +-o Ar option .Op Ic +-o Ar option