fix problem #1 and a comment

This commit is contained in:
tg 2011-05-07 00:24:35 +00:00
parent 88686b81bd
commit c38dfbf51a
2 changed files with 3 additions and 7 deletions

6
lex.c
View File

@ -22,7 +22,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.148 2011/05/05 00:04:57 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.149 2011/05/07 00:24:34 tg Exp $");
/*
* states while lexing word
@ -812,8 +812,6 @@ yylex(int cf)
*wp++ = QCHAR;
*wp++ = c;
}
/* invoke quoting mode */
Xstring(ws, wp)[0] = QCHAR;
} else if (c == '$') {
if ((c2 = getsc()) == '\'') {
PUSH_STATE(SEQUOTE);
@ -828,8 +826,6 @@ yylex(int cf)
sherestring_quoted:
*wp++ = OQUOTE;
ignore_backslash_newline++;
/* invoke quoting mode */
Xstring(ws, wp)[0] = QCHAR;
} else if (c == '"') {
sherestring_dquoted:
state = statep->type = SHEREDQUOTE;

4
tree.c
View File

@ -22,7 +22,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/tree.c,v 1.47 2011/05/05 00:05:01 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/tree.c,v 1.48 2011/05/07 00:24:35 tg Exp $");
#define INDENT 8
@ -197,7 +197,7 @@ ptree(struct op *t, int indent, struct shf *shf)
while (*ioact != NULL) {
struct ioword *iop = *ioact++;
/* heredoc is 0 when tracing (set -x) */
/* heredoc is NULL when tracing (set -x) */
if ((iop->flag & (IOTYPE | IOHERESTR)) == IOHERE &&
iop->heredoc) {
shf_putc('\n', shf);