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

more int → bool

Browse Source
This commit is contained in:
tg
2012-07-30 17:28:21 +00:00
parent 0db4002bd6
commit 9156b9eee4
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
eval.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.121 2012/07/20 23:22:10 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.122 2012/07/30 17:28:21 tg Exp $");
/* /*
* string expansion * string expansion
@ -41,7 +41,7 @@ typedef struct Expand {
struct shf *shf; /* file */ struct shf *shf; /* file */
} u; /* source */ } u; /* source */
struct tbl *var; /* variable in ${var..} */ struct tbl *var; /* variable in ${var..} */
short split; /* split "$@" / call waitlast $() */ bool split; /* split "$@" / call waitlast $() */
} Expand; } Expand;
#define XBASE 0 /* scanning original */ #define XBASE 0 /* scanning original */
@ -217,8 +217,8 @@ expand(const char *cp, /* input word */
SubType st_head, *st; SubType st_head, *st;
/* For trailing newlines in COMSUB */ /* For trailing newlines in COMSUB */
int newlines = 0; int newlines = 0;
int saw_eq, tilde_ok; bool saw_eq, make_magic;
int make_magic; int tilde_ok;
size_t len; size_t len;
if (cp == NULL) if (cp == NULL)
@ -240,11 +240,11 @@ expand(const char *cp, /* input word */
type = XBASE; type = XBASE;
sp = cp; sp = cp;
fdo = 0; fdo = 0;
saw_eq = 0; saw_eq = false;
/* must be 1/0 */ /* must be 1/0 */
tilde_ok = (f & (DOTILDE|DOASNTILDE)) ? 1 : 0; tilde_ok = (f & (DOTILDE|DOASNTILDE)) ? 1 : 0;
doblank = 0; doblank = 0;
make_magic = 0; make_magic = false;
word = (f&DOBLANK) ? IFS_WS : IFS_WORD; word = (f&DOBLANK) ? IFS_WS : IFS_WORD;
/* clang doesn't know OSUBST comes before CSUBST */ /* clang doesn't know OSUBST comes before CSUBST */
memset(&st_head, 0, sizeof(st_head)); memset(&st_head, 0, sizeof(st_head));
@ -758,19 +758,19 @@ expand(const char *cp, /* input word */
case OPAT: case OPAT:
/* open pattern: *(foo|bar) */ /* open pattern: *(foo|bar) */
/* Next char is the type of pattern */ /* Next char is the type of pattern */
make_magic = 1; make_magic = true;
c = *sp++ | 0x80; c = *sp++ | 0x80;
break; break;
case SPAT: case SPAT:
/* pattern separator (|) */ /* pattern separator (|) */
make_magic = 1; make_magic = true;
c = '|'; c = '|';
break; break;
case CPAT: case CPAT:
/* close pattern */ /* close pattern */
make_magic = 1; make_magic = true;
c = /*(*/ ')'; c = /*(*/ ')';
break; break;
} }
@ -900,7 +900,7 @@ expand(const char *cp, /* input word */
else else
XPput(*wp, debunk(p, p, strlen(p) + 1)); XPput(*wp, debunk(p, p, strlen(p) + 1));
fdo = 0; fdo = 0;
saw_eq = 0; saw_eq = false;
tilde_ok = (f & (DOTILDE|DOASNTILDE)) ? 1 : 0; tilde_ok = (f & (DOTILDE|DOASNTILDE)) ? 1 : 0;
if (c == 0) if (c == 0)
return; return;
@ -971,7 +971,7 @@ expand(const char *cp, /* input word */
if (!(f & DOTEMP) && !saw_eq && if (!(f & DOTEMP) && !saw_eq &&
(Flag(FBRACEEXPAND) || (Flag(FBRACEEXPAND) ||
(f & DOASNTILDE))) { (f & DOASNTILDE))) {
saw_eq = 1; saw_eq = true;
tilde_ok = 1; tilde_ok = 1;
} }
break; break;
@ -1013,7 +1013,7 @@ expand(const char *cp, /* input word */
quote &= ~2; quote &= ~2;
if (make_magic) { if (make_magic) {
make_magic = 0; make_magic = false;
fdo |= DOMAGIC | (f & DOGLOB); fdo |= DOMAGIC | (f & DOGLOB);
*dp++ = MAGIC; *dp++ = MAGIC;
} else if (ISMAGIC(c)) { } else if (ISMAGIC(c)) {
@ -1181,7 +1181,8 @@ varsub(Expand *xp, const char *sp, const char *word,
} else { } else {
xp->u.strv = (const char **)e->loc->argv + 1; xp->u.strv = (const char **)e->loc->argv + 1;
xp->str = *xp->u.strv++; xp->str = *xp->u.strv++;
xp->split = c == '@'; /* $@ */ /* $@ */
xp->split = tobool(c == '@');
state = XARG; state = XARG;
} }
/* POSIX 2009? */ /* POSIX 2009? */
@ -1221,7 +1222,8 @@ varsub(Expand *xp, const char *sp, const char *word,
XPput(wv, 0); XPput(wv, 0);
xp->u.strv = (const char **)XPptrv(wv); xp->u.strv = (const char **)XPptrv(wv);
xp->str = *xp->u.strv++; xp->str = *xp->u.strv++;
xp->split = p[1] == '@'; /* ${foo[@]} */ /* ${foo[@]} */
xp->split = tobool(p[1] == '@');
state = XARG; state = XARG;
} }
} else { } else {
@ -1301,7 +1303,7 @@ comsub(Expand *xp, const char *cp)
if (shf == NULL) if (shf == NULL)
errorf("%s: %s %s", name, "can't open", "$() input"); errorf("%s: %s %s", name, "can't open", "$() input");
/* no waitlast() */ /* no waitlast() */
xp->split = 0; xp->split = false;
} else { } else {
int ofd1, pv[2]; int ofd1, pv[2];
openpipe(pv); openpipe(pv);
@ -1315,7 +1317,7 @@ comsub(Expand *xp, const char *cp)
restfd(1, ofd1); restfd(1, ofd1);
startlast(); startlast();
/* waitlast() */ /* waitlast() */
xp->split = 1; xp->split = true;
} }
UTFMODE = old_utfmode; UTFMODE = old_utfmode;