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

I'm an idiot and this looks better and is more KISS (I suppose)

Browse Source 
too bad I don't just wrap it in braces
This commit is contained in:
tg
2007-07-06 02:39:37 +00:00
parent fca52a0f6a
commit a29f4f60f8
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eval.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.32 2007/07/06 02:22:56 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/eval.c,v 1.33 2007/07/06 02:39:36 tg Exp $");
#ifdef MKSH_SMALL #ifdef MKSH_SMALL
#define MKSH_NOPWNAM #define MKSH_NOPWNAM
@ -798,7 +798,7 @@ varsub(Expand *xp, const char *sp, const char *word,
stype = 0x80; stype = 0x80;
c = word[slen + 0] == CHAR ? word[slen + 1] : 0; c = word[slen + 0] == CHAR ? word[slen + 1] : 0;
} }
if (stype == 0x80 && !c && word[slen] && word[slen] != CHAR) { if (stype == 0x80 && (c == ' ' || c == '0')) {
stype |= '0'; stype |= '0';
} else if (ctype(c, C_SUBOP1)) { } else if (ctype(c, C_SUBOP1)) {
slen += 2; slen += 2;

11
lex.c
View File

@ -2,7 +2,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lex.c,v 1.41 2007/07/06 02:24:18 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lex.c,v 1.42 2007/07/06 02:39:37 tg Exp $");
/* Structure to keep track of the lexing state and the various pieces of info /* Structure to keep track of the lexing state and the various pieces of info
* needed for each particular state. */ * needed for each particular state. */
@ -291,7 +291,7 @@ yylex(int cf)
*wp++ = CHAR, *wp++ = c; *wp++ = CHAR, *wp++ = c;
c = getsc(); c = getsc();
if (c == ':') { if (c == ':') {
*wp++ = QCHAR; *wp++ = CHAR;
*wp++ = '0'; *wp++ = '0';
*wp++ = ADELIM; *wp++ = ADELIM;
*wp++ = ':'; *wp++ = ':';
@ -303,8 +303,11 @@ yylex(int cf)
c == '('/*)*/ || c == ' ' || c == '('/*)*/ || c == ' ' ||
c == '$' /* XXX what else? */) { c == '$' /* XXX what else? */) {
/* substring subst. */ /* substring subst. */
*wp++ = QCHAR; if (c != ' ') {
*wp++ = c; *wp++ = CHAR;
*wp++ = ' ';
}
ungetsc(c);
PUSH_STATE(SADELIM); PUSH_STATE(SADELIM);
statep->ls_sadelim.delimiter = ':'; statep->ls_sadelim.delimiter = ':';
statep->ls_sadelim.num = 2; statep->ls_sadelim.num = 2;