merge manpage and sync RCS IDs
not merged: POSuX character class nonsense
This commit is contained in:
parent
75e01cb305
commit
bf7c84eef6
4
misc.c
4
misc.c
@ -1,4 +1,4 @@
|
|||||||
/* $OpenBSD: misc.c,v 1.35 2009/01/17 22:06:44 millert Exp $ */
|
/* $OpenBSD: misc.c,v 1.36 2009/03/03 20:01:01 millert 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"
|
||||||
@ -6,7 +6,7 @@
|
|||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.98 2009/03/22 17:31:17 tg Exp $");
|
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.99 2009/03/22 18:09:16 tg Exp $");
|
||||||
|
|
||||||
#undef USE_CHVT
|
#undef USE_CHVT
|
||||||
#if defined(TIOCSCTTY) && !defined(MKSH_SMALL)
|
#if defined(TIOCSCTTY) && !defined(MKSH_SMALL)
|
||||||
|
16
mksh.1
16
mksh.1
@ -1,5 +1,5 @@
|
|||||||
.\" $MirOS: src/bin/mksh/mksh.1,v 1.150 2009/03/14 18:12:53 tg Exp $
|
.\" $MirOS: src/bin/mksh/mksh.1,v 1.151 2009/03/22 18:09:17 tg Exp $
|
||||||
.\" $OpenBSD: ksh.1,v 1.122 2008/05/17 23:31:52 sobrado Exp $
|
.\" $OpenBSD: ksh.1,v 1.128 2009/03/06 12:28:36 jmc Exp $
|
||||||
.\"-
|
.\"-
|
||||||
.\" Try to make GNU groff and AT&T nroff more compatible
|
.\" Try to make GNU groff and AT&T nroff more compatible
|
||||||
.\" * ` generates ‘ in groff, so use \`
|
.\" * ` generates ‘ in groff, so use \`
|
||||||
@ -30,7 +30,7 @@
|
|||||||
.el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
|
.el .xD \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8
|
||||||
..
|
..
|
||||||
.\"-
|
.\"-
|
||||||
.Dd $Mdocdate: March 14 2009 $
|
.Dd $Mdocdate: March 22 2009 $
|
||||||
.Dt MKSH 1
|
.Dt MKSH 1
|
||||||
.Os MirBSD
|
.Os MirBSD
|
||||||
.Sh NAME
|
.Sh NAME
|
||||||
@ -2851,6 +2851,11 @@ enables backslash interpretation (a no-op, since this is normally done), and
|
|||||||
.Fl E
|
.Fl E
|
||||||
suppresses backslash interpretation.
|
suppresses backslash interpretation.
|
||||||
.Pp
|
.Pp
|
||||||
|
If the
|
||||||
|
.Ic posix
|
||||||
|
option is set, only the first argument is treated as an option, and only
|
||||||
|
if it is exactly
|
||||||
|
.Dq Fl n .
|
||||||
.It Ic eval Ar command ...
|
.It Ic eval Ar command ...
|
||||||
The arguments are concatenated (with spaces between them) to form a single
|
The arguments are concatenated (with spaces between them) to form a single
|
||||||
string which the shell then parses and executes in the current environment.
|
string which the shell then parses and executes in the current environment.
|
||||||
@ -3446,8 +3451,9 @@ explicitly tested by a shell construct such as
|
|||||||
.Ic until ,
|
.Ic until ,
|
||||||
.Ic while ,
|
.Ic while ,
|
||||||
.Ic && ,
|
.Ic && ,
|
||||||
|
.Ic \*(Ba\*(Ba ,
|
||||||
or
|
or
|
||||||
.Ic \*(Ba\*(Ba
|
.Ic !\&
|
||||||
statements.
|
statements.
|
||||||
.It Fl f \*(Ba Ic noglob
|
.It Fl f \*(Ba Ic noglob
|
||||||
Do not expand file name patterns.
|
Do not expand file name patterns.
|
||||||
@ -4721,7 +4727,7 @@ Lowercases the next
|
|||||||
.Ar n
|
.Ar n
|
||||||
words.
|
words.
|
||||||
.It Xo edit\-line:
|
.It Xo edit\-line:
|
||||||
.Op Ar n
|
.Op Ar n
|
||||||
.No \*(haXe
|
.No \*(haXe
|
||||||
.Xc
|
.Xc
|
||||||
Edit line
|
Edit line
|
||||||
|
Loading…
x
Reference in New Issue
Block a user