diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-17 17:01:52 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-10-17 17:01:52 +0000 |
| commit | 9ffe596f251b6b35d59da3b9e204b315d34fdfbf (patch) | |
| tree | 8616c1e9fbde10800596127850ab2a5068bdc77a /Src | |
| parent | 6014bbdb459e30aee0f5ec4a7e0bdfb43a264adf (diff) | |
| download | zsh-9ffe596f251b6b35d59da3b9e204b315d34fdfbf.tar.gz zsh-9ffe596f251b6b35d59da3b9e204b315d34fdfbf.tar.xz zsh-9ffe596f251b6b35d59da3b9e204b315d34fdfbf.zip | |
zsh-3.1.6-bart-7-2 zsh-3.1.6-bart-7-2
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Zle/zle_tricky.c | 12 | ||||
| -rw-r--r-- | Src/init.c | 4 | ||||
| -rw-r--r-- | Src/main.c | 3 |
3 files changed, 6 insertions, 13 deletions
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index aa7686b64..70371b41c 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -811,7 +811,7 @@ check_param(char *s, int set, int test) *b != '=' && *b != Equals && *b != '~' && *b != Tilde) break; - if (*b == '#' || *b == Pound || *b == '+' || *b == ' ') + if (*b == '#' || *b == Pound || *b == '+') b++; e = b; @@ -6927,20 +6927,14 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) if (cc->mask & (CC_JOBS | CC_RUNNING | CC_STOPPED)) { /* Get job names. */ int i; - char *j, *jj; + char *j; for (i = 0; i < MAXJOB; i++) if ((jobtab[i].stat & STAT_INUSE) && jobtab[i].procs && jobtab[i].procs->text) { int stopped = jobtab[i].stat & STAT_STOPPED; - j = jj = dupstring(jobtab[i].procs->text); - /* Find the first word. */ - for (; *jj; jj++) - if (*jj == ' ') { - *jj = '\0'; - break; - } + j = dupstring(jobtab[i].procs->text); if ((cc->mask & CC_JOBS) || (stopped && (cc->mask & CC_STOPPED)) || (!stopped && (cc->mask & CC_RUNNING))) diff --git a/Src/init.c b/Src/init.c index 00ecd3ade..f0b9803e4 100644 --- a/Src/init.c +++ b/Src/init.c @@ -113,8 +113,8 @@ loop(int toplevel, int justonce) if (!(list = parse_event())) { /* if we couldn't parse a list */ hend(); if ((tok == ENDINPUT && !errflag) || - (tok == LEXERR && (!noerrexit || emulation == EMULATE_KSH) - && (!isset(SHINSTDIN) || !toplevel)) || justonce) + (tok == LEXERR && (!isset(SHINSTDIN) || !toplevel)) || + justonce) break; continue; } diff --git a/Src/main.c b/Src/main.c index c0999deae..762e06b90 100644 --- a/Src/main.c +++ b/Src/main.c @@ -87,8 +87,7 @@ main(int argc, char **argv) for (;;) { do loop(1,0); - while (tok != ENDINPUT && - (tok != LEXERR || noerrexit || isset(SHINSTDIN))); + while (tok != ENDINPUT && (tok != LEXERR || isset(SHINSTDIN))); if (tok == LEXERR) { stopmsg = 1; zexit(lastval, 0); |