diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-12-02 15:39:20 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-12-02 15:39:20 +0100 |
| commit | 8f07e7658dcdfecc082ddaaad8e26f460eb02d45 (patch) | |
| tree | a16ecc9a433b450827fbd056b06a3260592a8a37 /Src/utils.c | |
| parent | df234cd62d04180a54071c7a2a5210d1f16c8b98 (diff) | |
| parent | 56aa469d06a60ff23fe0c50ab9d44ae40c150412 (diff) | |
| download | zsh-8f07e7658dcdfecc082ddaaad8e26f460eb02d45.tar.gz zsh-8f07e7658dcdfecc082ddaaad8e26f460eb02d45.zip | |
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/utils.c')
| -rw-r--r-- | Src/utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Src/utils.c b/Src/utils.c index d1d9406c2..c6d178ce2 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2299,6 +2299,8 @@ checkrmall(char *s) sleep(10); fputc('\n', shout); } + if (errflag) + return 0; fputs(" [yn]? ", shout); fflush(shout); zbeep(); @@ -3983,7 +3985,7 @@ metafy(char *buf, int len, int heap) if (imeta(*e++)) meta++; - if (meta || heap == META_DUP || heap == META_HEAPDUP || *e != '\0') { + if (meta || heap == META_DUP || heap == META_HEAPDUP) { switch (heap) { case META_REALLOC: buf = zrealloc(buf, len + meta + 1); @@ -4026,8 +4028,8 @@ metafy(char *buf, int len, int heap) meta--; } } - *e = '\0'; } + *e = '\0'; return buf; } |