diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2017-08-10 17:16:37 +0200 |
| commit | e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74 (patch) | |
| tree | 8486633f6232f49ea330ab8e036decb5dc3bbf74 /Src/cond.c | |
| parent | f8edeff2494bf23e2ee29d4c761361b1c878e09d (diff) | |
| parent | dc475bfa0ec6cd03789dde3bf28f71e0ea9d5003 (diff) | |
| download | zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.tar.gz zsh-e3b67a8198c852bf6c9db3a0a1a20e87a4e1da74.zip | |
Merge tag '5.4.1' into debian
Release 5.4.1.
Diffstat (limited to 'Src/cond.c')
| -rw-r--r-- | Src/cond.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Src/cond.c b/Src/cond.c index 42e9de30f..b9a47cea5 100644 --- a/Src/cond.c +++ b/Src/cond.c @@ -138,13 +138,13 @@ evalcond(Estate state, char *fromtest) strs = arrdup(sbuf); l = 2; } - if (name && name[0] == '-') - errname = name; - else if (strs[0] && *strs[0] == '-') - errname = strs[0]; + if (name && IS_DASH(name[0])) + untokenize(errname = dupstring(name)); + else if (strs[0] && IS_DASH(*strs[0])) + untokenize(errname = strs[0]); else errname = "<null>"; - if (name && name[0] == '-' && + if (name && IS_DASH(name[0]) && (cd = getconddef((ctype == COND_MODI), name + 1, 1))) { if (ctype == COND_MOD && (l < cd->min || (cd->max >= 0 && l > cd->max))) { @@ -171,7 +171,7 @@ evalcond(Estate state, char *fromtest) strs[0] = dupstring(name); name = s; - if (name && name[0] == '-' && + if (name && IS_DASH(name[0]) && (cd = getconddef(0, name + 1, 1))) { if (l < cd->min || (cd->max >= 0 && l > cd->max)) { zwarnnam(fromtest, "unknown condition: %s", @@ -295,6 +295,8 @@ evalcond(Estate state, char *fromtest) int test, npat = state->pc[1]; Patprog pprog = state->prog->pats[npat]; + queue_signals(); + if (pprog == dummy_patprog1 || pprog == dummy_patprog2) { char *opat; int save; @@ -308,6 +310,7 @@ evalcond(Estate state, char *fromtest) if (!(pprog = patcompile(right, (save ? PAT_ZDUP : PAT_STATIC), NULL))) { zwarnnam(fromtest, "bad pattern: %s", right); + unqueue_signals(); return 2; } else if (save) @@ -316,6 +319,8 @@ evalcond(Estate state, char *fromtest) state->pc += 2; test = (pprog && pattry(pprog, left)); + unqueue_signals(); + return !(ctype == COND_STRNEQ ? !test : test); } case COND_STRLT: |