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

pull some quoting fixes from oksh; original patch from Alexander Polakov

Browse Source
This commit is contained in:
tg
2013-06-01 00:15:58 +00:00
parent d5eda34c8b
commit ec1bc74d41
3 changed files with 139 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: lex.c,v 1.46 2013/01/20 14:47:46 stsp Exp $ */
/* $OpenBSD: lex.c,v 1.47 2013/03/03 19:11:34 guenther Exp $ */
/*-
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@ -23,7 +23,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.185 2013/05/02 21:59:49 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.186 2013/06/01 00:15:57 tg Exp $");
/*
* states while lexing word
@ -338,7 +338,9 @@ yylex(int cf)
}
break;
case '\'':
open_ssquote:
open_ssquote_unless_heredoc:
if ((cf & HEREDOC))
goto store_char;
*wp++ = OQUOTE;
ignore_backslash_newline++;
PUSH_STATE(SSQUOTE);
@ -501,7 +503,8 @@ yylex(int cf)
PUSH_STATE(STBRACEKORN);
} else {
ungetsc(c);
if (state == SDQUOTE)
if (state == SDQUOTE ||
state == SQBRACE)
PUSH_STATE(SQBRACE);
else
PUSH_STATE(SBRACE);
@ -622,6 +625,8 @@ yylex(int cf)
case SSQUOTE:
if (c == '\'') {
POP_STATE();
if ((cf & HEREDOC) || state == SQBRACE)
goto store_char;
*wp++ = CQUOTE;
ignore_backslash_newline--;
} else {
@ -699,7 +704,7 @@ yylex(int cf)
case SBRACE:
if (c == '\'')
goto open_ssquote;
goto open_ssquote_unless_heredoc;
else if (c == '\\')
goto getsc_qchar;
common_SQBRACE:
@ -818,7 +823,7 @@ yylex(int cf)
}
break;
case '\'':
goto open_ssquote;
goto open_ssquote_unless_heredoc;
case '$':
if ((c2 = getsc()) == '\'') {
open_sequote: