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

g/c magic definitions for simple chars (as opposed to e.g. tokens/lexems)

Browse Source 
some (such as NOT) were already gone; this should unconfuse; most were
unused anyway…
This commit is contained in:
tg
2012-03-27 22:58:39 +00:00
parent 2a47cab08f
commit 16ac73b074
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
eval.c
View File

@@ -23,7 +23,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.113 2012/03/23 23:25:27 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.114 2012/03/27 22:58:38 tg Exp $");
/*
* string expansion
@@ -936,10 +936,10 @@ expand(const char *cp, /* input word */
*dp++ = MAGIC;
}
break;
case OBRACE:
case '{':
case '}':
case ',':
case CBRACE:
if ((f & DOBRACE) && (c == OBRACE ||
if ((f & DOBRACE) && (c == '{' /*}*/ ||
(fdo & DOBRACE))) {
fdo |= DOBRACE|DOMAGIC;
*dp++ = MAGIC;
@@ -1664,7 +1664,7 @@ alt_expand(XPtrV *wp, char *start, char *exp_start, char *end, int fdo)
char *p;
/* search for open brace */
for (p = exp_start; (p = strchr(p, MAGIC)) && p[1] != OBRACE; p += 2)
for (p = exp_start; (p = strchr(p, MAGIC)) && p[1] != '{' /*}*/; p += 2)
;
brace_start = p;
@@ -1674,9 +1674,9 @@ alt_expand(XPtrV *wp, char *start, char *exp_start, char *end, int fdo)
count = 1;
for (p += 2; *p && count; p++) {
if (ISMAGIC(*p)) {
if (*++p == OBRACE)
if (*++p == '{' /*}*/)
count++;
else if (*p == CBRACE)
else if (*p == /*{*/ '}')
--count;
else if (*p == ',' && count == 1)
comma = p;
@@ -1707,9 +1707,9 @@ alt_expand(XPtrV *wp, char *start, char *exp_start, char *end, int fdo)
count = 1;
for (p = brace_start + 2; p != brace_end; p++) {
if (ISMAGIC(*p)) {
if (*++p == OBRACE)
if (*++p == '{' /*}*/)
count++;
else if ((*p == CBRACE && --count == 0) ||
else if ((*p == /*{*/ '}' && --count == 0) ||
(*p == ',' && count == 1)) {
char *news;
int l1, l2, l3;