From 505c14ca0522dc4f5be90e7ed7c0efa60cfce91e Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Fri, 26 Nov 1999 01:07:50 +0000 Subject: zsh-workers/8779 --- Src/utils.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Src/utils.c b/Src/utils.c index b13b2e037..c4789630d 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -76,7 +76,7 @@ zwarn(const char *fmt, const char *str, int num) */ nicezputs((isset(SHINSTDIN) && !locallevel) ? "zsh" : scriptname ? scriptname : argzero, stderr); - fputs(": ", stderr); + fputc((unsigned char)':', stderr); zerrmsg(fmt, str, num); } @@ -89,11 +89,11 @@ zwarnnam(const char *cmd, const char *fmt, const char *str, int num) trashzle(); if (unset(SHINSTDIN) || locallevel) { nicezputs(scriptname ? scriptname : argzero, stderr); - fputs(": ", stderr); + fputc((unsigned char)':', stderr); } if (cmd) { nicezputs(cmd, stderr); - fputs(": ", stderr); + fputc((unsigned char)':', stderr); } zerrmsg(fmt, str, num); } @@ -102,6 +102,11 @@ zwarnnam(const char *cmd, const char *fmt, const char *str, int num) void zerrmsg(const char *fmt, const char *str, int num) { + if ((unset(SHINSTDIN) || locallevel) && lineno) + fprintf(stderr, "%ld: ", (long)lineno); + else + fputc((unsigned char)' ', stderr); + while (*fmt) if (*fmt == '%') { fmt++; @@ -149,10 +154,7 @@ zerrmsg(const char *fmt, const char *str, int num) putc(*fmt == Meta ? *++fmt ^ 32 : *fmt, stderr); fmt++; } - if ((unset(SHINSTDIN) || locallevel) && lineno) - fprintf(stderr, " [%ld]\n", (long)lineno); - else - putc('\n', stderr); + putc('\n', stderr); fflush(stderr); } -- cgit 1.4.1