From bbf8d8baf0389b4bb20dfbdd48c62bc789e1a5fc Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 14 Mar 2000 11:17:57 +0000 Subject: zsh-workers/10131 --- Src/Modules/stat.c | 16 ++++++++-------- Src/Modules/zpty.c | 20 ++++++++++---------- Src/Modules/zutil.c | 36 ++++++++++++++++++------------------ 3 files changed, 36 insertions(+), 36 deletions(-) (limited to 'Src/Modules') diff --git a/Src/Modules/stat.c b/Src/Modules/stat.c index 7e7463bb7..ab4316f7b 100644 --- a/Src/Modules/stat.c +++ b/Src/Modules/stat.c @@ -347,10 +347,10 @@ bin_stat(char *name, char **args, char *ops, int func) iwhich = aptr - statelts; } if (found > 1) { - zerrnam(name, "%s: ambiguous stat element", arg, 0); + zwarnnam(name, "%s: ambiguous stat element", arg, 0); return 1; } else if (found == 0) { - zerrnam(name, "%s: no such stat element", arg, 0); + zwarnnam(name, "%s: no such stat element", arg, 0); return 1; } /* if name of link requested, turn on lstat */ @@ -365,7 +365,7 @@ bin_stat(char *name, char **args, char *ops, int func) if (arg[1]) { arrnam = arg+1; } else if (!(arrnam = *++args)) { - zerrnam(name, "missing parameter name\n", + zwarnnam(name, "missing parameter name", NULL, 0); return 1; } @@ -375,7 +375,7 @@ bin_stat(char *name, char **args, char *ops, int func) if (arg[1]) { hashnam = arg+1; } else if (!(hashnam = *++args)) { - zerrnam(name, "missing parameter name\n", + zwarnnam(name, "missing parameter name", NULL, 0); return 1; } @@ -387,12 +387,12 @@ bin_stat(char *name, char **args, char *ops, int func) if (arg[1]) { sfd = arg+1; } else if (!(sfd = *++args)) { - zerrnam(name, "missing file descriptor\n", NULL, 0); + zwarnnam(name, "missing file descriptor", NULL, 0); return 1; } fd = zstrtol(sfd, &sfd, 10); if (*sfd) { - zerrnam(name, "bad file descriptor\n", NULL, 0); + zwarnnam(name, "bad file descriptor", NULL, 0); return 1; } break; @@ -400,14 +400,14 @@ bin_stat(char *name, char **args, char *ops, int func) if (arg[1]) { timefmt = arg+1; } else if (!(timefmt = *++args)) { - zerrnam(name, "missing time format\n", NULL, 0); + zwarnnam(name, "missing time format", NULL, 0); return 1; } /* force string format in order to use time format */ ops['s'] = 1; break; } else { - zerrnam(name, "bad option: -%c", NULL, *arg); + zwarnnam(name, "bad option: -%c", NULL, *arg); return 1; } } diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c index 5ee6438be..3692a5224 100644 --- a/Src/Modules/zpty.c +++ b/Src/Modules/zpty.c @@ -261,17 +261,17 @@ newptycmd(char *nam, char *pname, char **args, int echo, int block) char *cmd; if (!(cmd = findcmd(*args, 1))) { - zerrnam(nam, "unknown command: %s", *args, 0); + zwarnnam(nam, "unknown command: %s", *args, 0); return 1; } if (get_pty(&master, &slave)) { - zerrnam(nam, "can't open pseudo terminal", NULL, 0); + zwarnnam(nam, "can't open pseudo terminal", NULL, 0); return 1; } if ((pid = fork()) == -1) { close(master); close(slave); - zerrnam(nam, "couldn't create pty command: %s", pname, 0); + zwarnnam(nam, "couldn't create pty command: %s", pname, 0); return 1; } else if (!pid) { if (!echo) { @@ -404,14 +404,14 @@ ptyread(char *nam, Ptycmd cmd, char **args) char *p; if (args[2]) { - zerrnam(nam, "too many arguments", NULL, 0); + zwarnnam(nam, "too many arguments", NULL, 0); return 1; } p = dupstring(args[1]); tokenize(p); remnulargs(p); if (!(prog = patcompile(p, PAT_STATIC, NULL))) { - zerrnam(nam, "bad pattern: %s", args[1], 0); + zwarnnam(nam, "bad pattern: %s", args[1], 0); return 1; } } @@ -526,17 +526,17 @@ bin_zpty(char *nam, char **args, char *ops, int func) ops['d'] || ops['L'])) || (ops['d'] && (ops['b'] || ops['e'] || ops['L'])) || (ops['L'] && (ops['b'] || ops['e']))) { - zerrnam(nam, "illegal option combination", NULL, 0); + zwarnnam(nam, "illegal option combination", NULL, 0); return 1; } if (ops['r'] || ops['w']) { Ptycmd p; if (!*args) { - zerrnam(nam, "missing pty command name", NULL, 0); + zwarnnam(nam, "missing pty command name", NULL, 0); return 1; } else if (!(p = getptycmd(*args))) { - zerrnam(nam, "no such pty command: %s", *args, 0); + zwarnnam(nam, "no such pty command: %s", *args, 0); return 1; } checkptycmd(p); @@ -563,11 +563,11 @@ bin_zpty(char *nam, char **args, char *ops, int func) return ret; } else if (*args) { if (!args[1]) { - zerrnam(nam, "missing command", NULL, 0); + zwarnnam(nam, "missing command", NULL, 0); return 1; } if (getptycmd(*args)) { - zerrnam(nam, "pty command name already used: %s", *args, 0); + zwarnnam(nam, "pty command name already used: %s", *args, 0); return 1; } return newptycmd(nam, *args, args + 1, ops['e'], ops['b']); diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c index f2a3ed34c..525d570a0 100644 --- a/Src/Modules/zutil.c +++ b/Src/Modules/zutil.c @@ -213,7 +213,7 @@ bin_zstyle(char *nam, char **args, char *ops, int func) if ((oc = args[0][1]) && oc != '-') { if (args[0][2]) { - zerrnam(nam, "invalid argument: %s", args[0], 0); + zwarnnam(nam, "invalid argument: %s", args[0], 0); return 1; } if (oc == 'L') @@ -231,14 +231,14 @@ bin_zstyle(char *nam, char **args, char *ops, int func) char *pat; if (arrlen(args) < 2) { - zerrnam(nam, "not enough arguments", NULL, 0); + zwarnnam(nam, "not enough arguments", NULL, 0); return 1; } pat = dupstring(args[0]); tokenize(pat); if (!(prog = patcompile(pat, PAT_ZDUP, NULL))) { - zerrnam(nam, "invalid pattern: %s", args[0], 0); + zwarnnam(nam, "invalid pattern: %s", args[0], 0); return 1; } if (!(s = getstyle(args[1]))) @@ -285,15 +285,15 @@ bin_zstyle(char *nam, char **args, char *ops, int func) case 'm': min = 3; max = 3; break; case 'g': min = 1; max = 3; break; default: - zerrnam(nam, "invalid option: %s", args[0], 0); + zwarnnam(nam, "invalid option: %s", args[0], 0); return 1; } n = arrlen(args) - 1; if (n < min) { - zerrnam(nam, "not enough arguments", NULL, 0); + zwarnnam(nam, "not enough arguments", NULL, 0); return 1; } else if (max >= 0 && n > max) { - zerrnam(nam, "too many arguments", NULL, 0); + zwarnnam(nam, "too many arguments", NULL, 0); return 1; } switch (args[0][1]) { @@ -511,7 +511,7 @@ bin_zformat(char *nam, char **args, char *ops, int func) char opt; if (args[0][0] != '-' || !(opt = args[0][1]) || args[0][2]) { - zerrnam(nam, "invalid argument: %s", args[0], 0); + zwarnnam(nam, "invalid argument: %s", args[0], 0); return 1; } args++; @@ -528,7 +528,7 @@ bin_zformat(char *nam, char **args, char *ops, int func) if (!ap[0][0] || ap[0][0] == '-' || ap[0][0] == '.' || (ap[0][0] >= '0' && ap[0][0] <= '9') || ap[0][1] != ':') { - zerrnam(nam, "invalid argument: %s", *ap, 0); + zwarnnam(nam, "invalid argument: %s", *ap, 0); return 1; } specs[STOUC(ap[0][0])] = ap[0] + 2; @@ -670,7 +670,7 @@ bin_zformat(char *nam, char **args, char *ops, int func) } break; } - zerrnam(nam, "invalid option: -%c", 0, opt); + zwarnnam(nam, "invalid option: -%c", 0, opt); return 1; } @@ -1298,7 +1298,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) break; case 'a': if (defarr) { - zerrnam(nam, "default array given more than once", NULL, 0); + zwarnnam(nam, "default array given more than once", NULL, 0); return 1; } if (o[2]) @@ -1306,7 +1306,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) else if (*args) n = *args++; else { - zerrnam(nam, "missing array name", NULL, 0); + zwarnnam(nam, "missing array name", NULL, 0); return 1; } defarr = (Zoptarr) zhalloc(sizeof(*defarr)); @@ -1322,7 +1322,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) else if (*args) assoc = *args++; else { - zerrnam(nam, "missing array name", NULL, 0); + zwarnnam(nam, "missing array name", NULL, 0); return 1; } break; @@ -1336,7 +1336,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) } while ((o = dupstring(*args++))) { if (!*o) { - zerrnam(nam, "invalid option description: %s", o, 0); + zwarnnam(nam, "invalid option description: %s", o, 0); return 1; } f = 0; @@ -1375,10 +1375,10 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) opt_arrs = a; } } else if (*p) { - zerrnam(nam, "invalid option description: %s", args[-1], 0); + zwarnnam(nam, "invalid option description: %s", args[-1], 0); return 1; } else if (!(a = defarr) && !assoc) { - zerrnam(nam, "no default array defined: %s", args[-1], 0); + zwarnnam(nam, "no default array defined: %s", args[-1], 0); return 1; } for (p = n = o; *p; p++) { @@ -1387,7 +1387,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) *n++ = *p; } if (get_opt_desc(o)) { - zerrnam(nam, "option defined more than once: %s", o, 0); + zwarnnam(nam, "option defined more than once: %s", o, 0); return 1; } d = (Zoptdesc) zhalloc(sizeof(*d)); @@ -1419,7 +1419,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) break; } else if (!(d->flags & ZOF_OPT)) { if (!pp[1]) { - zerrnam(nam, "missing argument for option: %s", + zwarnnam(nam, "missing argument for option: %s", d->name, 0); return 1; } @@ -1439,7 +1439,7 @@ bin_zparseopts(char *nam, char **args, char *ops, int func) add_opt_val(d, e); else if (!(d->flags & ZOF_OPT)) { if (!pp[1]) { - zerrnam(nam, "missing argument for option: %s", + zwarnnam(nam, "missing argument for option: %s", d->name, 0); return 1; } -- cgit 1.4.1