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

there was a comment on 1015; change comments to match, no code change

Browse Source
This commit is contained in:
tg 2016-03-01 19:22:31 +00:00
parent c2bdb1b9dd
commit 539714f78a
2 changed files with 15 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lex.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.221 2016/03/01 18:30:04 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.222 2016/03/01 19:22:31 tg Exp $");
/* /*
* states while lexing word * states while lexing word
@ -526,33 +526,13 @@ yylex(int cf)
*wp++ = COMSUB; *wp++ = COMSUB;
/* /*
* We need to know whether we are within double * We need to know whether we are within double
* quotes, since most shells translate \" to " * quotes in order to translate \" to " within
* within "…`…\"…`…". This is not done in POSIX * "…`…\"…`…" because, unlike for COMSUBs, the
* mode (§2.2.3 Double-Quotes: “The backquote * outer double quoteing changes the backslash
* shall retain its special meaning introducing * meaning for the inside. For more details:
* the other form of command substitution (see * http://austingroupbugs.net/view.php?id=1015
* Command Substitution). The portion of the
* quoted string from the initial backquote and
* the characters up to the next backquote that
* is not preceded by a <backslash>, having
* escape characters removed, defines that
* command whose output replaces "`...`" when
* the word is expanded.”; §2.6.3 Command
* Substitution: “Within the backquoted style
* of command substitution, <backslash> shall
* retain its literal meaning, except when
* followed by: '$', '`', or <backslash>. The
* search for the matching backquote shall be
* satisfied by the first unquoted non-escaped
* backquote; during this search, if a
* non-escaped backquote is encountered[…],
* undefined results occur.”).
*/ */
statep->ls_bool = false; statep->ls_bool = false;
#ifdef austingroupbugs1015_is_still_not_resolved
if (Flag(FPOSIX))
break;
#endif
s2 = statep; s2 = statep;
base = state_info.base; base = state_info.base;
while (/* CONSTCOND */ 1) { while (/* CONSTCOND */ 1) {

29
mksh.1
View File

@ -1,4 +1,4 @@
.\" $MirOS: src/bin/mksh/mksh.1,v 1.390 2016/02/26 19:38:42 tg Exp $ .\" $MirOS: src/bin/mksh/mksh.1,v 1.391 2016/03/01 19:22:31 tg Exp $
.\" $OpenBSD: ksh.1,v 1.160 2015/07/04 13:27:04 feinerer Exp $ .\" $OpenBSD: ksh.1,v 1.160 2015/07/04 13:27:04 feinerer Exp $
.\"- .\"-
.\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
@ -76,7 +76,7 @@
.\" with -mandoc, it might implement .Mx itself, but we want to .\" with -mandoc, it might implement .Mx itself, but we want to
.\" use our own definition. And .Dd must come *first*, always. .\" use our own definition. And .Dd must come *first*, always.
.\" .\"
.Dd $Mdocdate: February 26 2016 $ .Dd $Mdocdate: March 1 2016 $
.\" .\"
.\" Check which macro package we use, and do other -mdoc setup. .\" Check which macro package we use, and do other -mdoc setup.
.\" .\"
@ -1004,13 +1004,14 @@ quotes all characters, except
.Ql \` .Ql \`
and and
.Ql \e , .Ql \e ,
up to the next unquoted double quote. up to the next unescaped double quote.
.Ql $ .Ql $
and and
.Ql \` .Ql \`
inside double quotes have their usual meaning (i.e. parameter, arithmetic, inside double quotes have their usual meaning (i.e. parameter, arithmetic,
or command substitution) except no field splitting is carried out on the or command substitution) except no field splitting is carried out on the
results of double-quoted substitutions. results of double-quoted substitutions, and the old-style form of command
substitution has backslash-quoting for double quotes enabled.
If a If a
.Ql \e .Ql \e
inside a double-quoted string is followed by inside a double-quoted string is followed by
@ -1307,13 +1308,13 @@ form, a
followed by any of followed by any of
.Ql $ , .Ql $ ,
.Ql \` , .Ql \` ,
.Ql \&"
.Pq currently, and violating Tn POSIX ,
or or
.Ql \e .Ql \e
is stripped (a is stripped (as is
.Ql \&"
when the substitution is part of a double-quoted string); a backslash
.Ql \e .Ql \e
followed by any other character is unchanged). followed by any other character is unchanged.
As a special case in command substitutions, a command of the form As a special case in command substitutions, a command of the form
.Pf \*(Lt Ar file .Pf \*(Lt Ar file
is interpreted to mean substitute the contents of is interpreted to mean substitute the contents of
@ -6578,18 +6579,6 @@ when multiple shells are accessing the file; the rollover process
for the in-memory portion of the history is slow, should use for the in-memory portion of the history is slow, should use
.Xr memmove 3 . .Xr memmove 3 .
.Pp .Pp
Handling of backslash plus double-quote inside the (deprecated)
.Pf \` Ns Ar command Ns \`
form of command substitution when the substitution itself is
also inside double quotes currently deliberately violates
.Tn POSIX
even in
.Fl o Ic posix
mode until Austin group bug 1015 has been resolved either way,
as the current wording of the standard prohibits the current
and historic practice of several shells which several scripts
(admittedly wrongly) depend on.
.Pp
This document attempts to describe This document attempts to describe
.Nm mksh\ R52b+CVS .Nm mksh\ R52b+CVS
and up, and up,