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

Merge OpenBSD-current

Browse Source
This commit is contained in:
tg
2003-09-25 20:59:37 +00:00
parent 631b74793f
commit 434b10fb3c
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
emacs.c
View File

@ -1,5 +1,5 @@
/* $MirBSD: emacs.c,v 1.5 2003/08/31 20:54:03 tg Exp $ */ /* $MirBSD: emacs.c,v 1.6 2003/09/25 20:59:35 tg Exp $ */
/* $OpenBSD: emacs.c,v 1.26 2003/08/27 14:56:11 fgsch Exp $ */ /* $OpenBSD: emacs.c,v 1.27 2003/09/01 15:47:40 naddy Exp $ */
/* /*
* Emacs-like command line editing and history * Emacs-like command line editing and history

35
ksh.1tbl
View File

@ -1,5 +1,5 @@
.\" $MirBSD: ksh.1tbl,v 1.9 2003/07/19 20:22:30 tg Exp $ .\" $MirBSD: ksh.1tbl,v 1.10 2003/09/25 20:59:36 tg Exp $
.\" $OpenBSD: ksh.1tbl,v 1.55 2003/07/19 08:07:35 jmc Exp $ .\" $OpenBSD: ksh.1tbl,v 1.58 2003/09/04 14:21:43 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.
@ -285,7 +285,7 @@ shell and must be quoted if they are to represent themselves:
.Ql { , .Ql { ,
.Ql } , .Ql } ,
.Ql * , .Ql * ,
.Ql ? , .Ql \&? ,
and and
.Ql [ . .Ql [ .
The first three of these are the above mentioned quoting characters (see The first three of these are the above mentioned quoting characters (see
@ -318,7 +318,7 @@ style alterations (see
below); below);
and finally, and finally,
.Ql * , .Ql * ,
.Ql ? , .Ql \&? ,
and and
.Ql [ .Ql [
are used in file name generation (see are used in file name generation (see
@ -374,7 +374,7 @@ last is piped (see
to the standard input of the following command. to the standard input of the following command.
The exit status of a pipeline is that of its last command. The exit status of a pipeline is that of its last command.
A pipeline may be prefixed by the A pipeline may be prefixed by the
.Ql ! .Ql \&!
reversed word which causes the exit status of the pipeline to be logically reversed word which causes the exit status of the pipeline to be logically
complemented: if the original status was 0 the complemented status will be 1; complemented: if the original status was 0 the complemented status will be 1;
if the original status was not 0, the complemented status will be 0. if the original status was not 0, the complemented status will be 0.
@ -1246,7 +1246,7 @@ command below for list of options).
.It Ev \&? .It Ev \&?
The exit status of the last non-asynchronous command executed. The exit status of the last non-asynchronous command executed.
If the last command was killed by a signal, If the last command was killed by a signal,
.Ic \&$\&? .Ic \&$?\&
is set to 128 plus the signal number. is set to 128 plus the signal number.
.It Ev 0 .It Ev 0
The name the shell was invoked with (i.e., The name the shell was invoked with (i.e.,
@ -1447,7 +1447,7 @@ The default is 600 (10 minutes).
.It Ev MAILPATH .It Ev MAILPATH
A list of files to be checked for mail. A list of files to be checked for mail.
The list is colon separated, and each file may be followed by a The list is colon separated, and each file may be followed by a
.Ql ? .Ql \&?
and a message to be printed if new mail has arrived. and a message to be printed if new mail has arrived.
Command, parameter and Command, parameter and
arithmetic substitution is performed on the message, and, during substitution, arithmetic substitution is performed on the message, and, during substitution,
@ -1492,12 +1492,12 @@ The process ID of the shell's parent (read-only).
The primary prompt for interactive shells. The primary prompt for interactive shells.
Parameter, command, and arithmetic Parameter, command, and arithmetic
substitutions are performed, and substitutions are performed, and
.Ql ! .Ql \&!
is replaced with the current command number (see is replaced with the current command number (see
.Ic fc .Ic fc
command below). command below).
A literal A literal
.Ql ! .Ql \&!
can be put in the prompt by placing can be put in the prompt by placing
.Ql !! .Ql !!
in in
@ -1664,7 +1664,7 @@ Brace expansion is carried out after parameter substitution
and before file name generation. and before file name generation.
.Ss File name patterns .Ss File name patterns
A file name pattern is a word containing one or more unquoted A file name pattern is a word containing one or more unquoted
.Ql ? .Ql \&?
or or
.Ql * .Ql *
characters or characters or
@ -1697,7 +1697,7 @@ Similarly, a
must be quoted or the first character in the list if it is to represent itself must be quoted or the first character in the list if it is to represent itself
instead of the end of the list. instead of the end of the list.
Also, a 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 No .. Ns Ic \&]
@ -2422,7 +2422,7 @@ command substitutions performed in generating the
.Ic set .Ic set
command. command.
For example, For example,
.Ic set \&-\&- `false`; echo $? .Ic set \&-\&- `false`; echo $?\&
prints 0 in prints 0 in
.Tn POSIX .Tn POSIX
mode, 1 in mode, 1 in
@ -2844,7 +2844,7 @@ The shell exits with the specified exit status.
If If
.Ar status .Ar status
is not specified, the exit status is the current value of the is not specified, the exit status is the current value of the
.Ic \&? .Ic ?\&
parameter. parameter.
.It Xo Ic export Op Fl p .It Xo Ic export Op Fl p
.Op Ar parameter Ns Op \&= Ns Ar value .Op Ar parameter Ns Op \&= Ns Ar value
@ -3561,7 +3561,7 @@ is set (see
.Ic set .Ic set
command above for a list of options). command above for a list of options).
As a non-standard extension, if the option starts with a As a non-standard extension, if the option starts with a
.Ql ! , .Ql \&! ,
the test is negated; the test always fails if the test is negated; the test always fails if
.Ar option .Ar option
doesn't exist (thus doesn't exist (thus
@ -3675,15 +3675,15 @@ arguments to
or or
.Ic \&[ ... \&] .Ic \&[ ... \&]
is less than five; if leading is less than five; if leading
.Ql ! .Ql \&!
arguments can be stripped such that only one argument remains then a string arguments can be stripped such that only one argument remains then a string
length test is performed (again, even if the argument is a unary operator); if length test is performed (again, even if the argument is a unary operator); if
leading leading
.Ql ! .Ql \&!
arguments can be stripped such that three arguments remain and the second arguments can be stripped such that three arguments remain and the second
argument is a binary operator, then the binary operation is performed (even argument is a binary operator, then the binary operation is performed (even
if the first argument is a unary operator, including an unstripped if the first argument is a unary operator, including an unstripped
.Ql ! ) . .Ql \&! ) .
.Pp .Pp
.Sy Note: .Sy Note:
A common mistake is to use A common mistake is to use
@ -4318,6 +4318,7 @@ off by entering
.Ic set +o emacs-usemeta , .Ic set +o emacs-usemeta ,
which is default in the which is default in the
.Mx 6 .Mx 6
and up
.Pa /etc/profile .Pa /etc/profile
file. file.
In the emacs mode, various editing commands In the emacs mode, various editing commands

4
misc.c
View File

@ -1,5 +1,5 @@
/* $MirBSD: misc.c,v 1.3 2003/08/16 15:19:49 tg Exp $ */ /* $MirBSD: misc.c,v 1.4 2003/09/25 20:59:37 tg Exp $ */
/* $OpenBSD: misc.c,v 1.18 2003/08/06 21:08:05 millert Exp $ */ /* $OpenBSD: misc.c,v 1.19 2003/09/01 15:47:40 naddy Exp $ */
/* /*
* Miscellaneous functions * Miscellaneous functions

4
sh.h
View File

@ -1,5 +1,5 @@
/* $MirBSD: sh.h,v 1.4 2003/06/26 18:26:21 tg Exp $ */ /* $MirBSD: sh.h,v 1.5 2003/09/25 20:59:37 tg Exp $ */
/* $OpenBSD: sh.h,v 1.13 2003/05/16 19:58:57 jsyn Exp $ */ /* $OpenBSD: sh.h,v 1.14 2003/09/01 15:47:40 naddy Exp $ */
/* /*
* Public Domain Bourne/Korn shell * Public Domain Bourne/Korn shell