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/Zle/compctl.c | 20 ++++++------ Src/Zle/complete.c | 16 +++++----- Src/Zle/computil.c | 90 ++++++++++++++++++++++++++-------------------------- Src/Zle/zle_main.c | 2 +- Src/Zle/zle_thingy.c | 26 +++++++-------- 5 files changed, 77 insertions(+), 77 deletions(-) (limited to 'Src/Zle') diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index 9c4d42015..1094684aa 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -508,7 +508,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) char *p; if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } if ((*argv)[1]) { @@ -654,7 +654,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'l': if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } else if ((*argv)[1]) { cct.subcmd = (*argv) + 1; @@ -670,7 +670,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'h': if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } else if ((*argv)[1]) { cct.substr = (*argv) + 1; @@ -783,7 +783,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'C': if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } if (first && !hx) { @@ -796,7 +796,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'D': if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } if (first && !hx) { @@ -810,7 +810,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'T': if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } if (first && !hx) { @@ -823,7 +823,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'L': if (cl) { - zerrnam(name, "illegal option -%c", NULL, **argv); + zwarnnam(name, "illegal option -%c", NULL, **argv); return 1; } if (!first || hx) { @@ -834,7 +834,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) break; case 'x': if (cl) { - zerrnam(name, "extended completion not allowed", NULL, 0); + zwarnnam(name, "extended completion not allowed", NULL, 0); return 1; } if (!argv[1]) { @@ -869,7 +869,7 @@ get_compctl(char *name, char ***av, Compctl cc, int first, int isdef, int cl) if (*++argv && (!ready || ready == 2) && **argv == '+' && !argv[0][1]) { if (cl) { - zerrnam(name, "xor'ed completion illegal", NULL, 0); + zwarnnam(name, "xor'ed completion illegal", NULL, 0); return 1; } /* There's an alternative (+) completion: assign @@ -1681,7 +1681,7 @@ static int bin_compcall(char *name, char **argv, char *ops, int func) { if (incompfunc != 1) { - zerrnam(name, "can only be called from completion function", NULL, 0); + zwarnnam(name, "can only be called from completion function", NULL, 0); return 1; } return makecomplistctl((ops['T'] ? 0 : CFN_FIRST) | diff --git a/Src/Zle/complete.c b/Src/Zle/complete.c index 0bc2d55fc..f625c34cd 100644 --- a/Src/Zle/complete.c +++ b/Src/Zle/complete.c @@ -388,7 +388,7 @@ bin_compadd(char *name, char **argv, char *ops, int func) Cmatcher match = NULL; if (incompfunc != 1) { - zerrnam(name, "can only be called from completion function", NULL, 0); + zwarnnam(name, "can only be called from completion function", NULL, 0); return 1; } dat.ipre = dat.isuf = dat.ppre = dat.psuf = dat.prpre = @@ -521,7 +521,7 @@ bin_compadd(char *name, char **argv, char *ops, int func) argv++; goto ca_args; default: - zerrnam(name, "bad option: -%c", NULL, *p); + zwarnnam(name, "bad option: -%c", NULL, *p); return 1; } if (sp) { @@ -535,7 +535,7 @@ bin_compadd(char *name, char **argv, char *ops, int func) *sp = *argv; p = "" - 1; } else { - zerrnam(name, e, NULL, *p); + zwarnnam(name, e, NULL, *p); return 1; } if (dm) { @@ -800,11 +800,11 @@ bin_compset(char *name, char **argv, char *ops, int func) char *sa = NULL, *sb = NULL; if (incompfunc != 1) { - zerrnam(name, "can only be called from completion function", NULL, 0); + zwarnnam(name, "can only be called from completion function", NULL, 0); return 1; } if (argv[0][0] != '-') { - zerrnam(name, "missing option", NULL, 0); + zwarnnam(name, "missing option", NULL, 0); return 1; } switch (argv[0][1]) { @@ -816,7 +816,7 @@ bin_compset(char *name, char **argv, char *ops, int func) case 'S': test = CVT_SUFPAT; break; case 'q': return set_comp_sep(); default: - zerrnam(name, "bad option -%c", NULL, argv[0][1]); + zwarnnam(name, "bad option -%c", NULL, argv[0][1]); return 1; } if (argv[0][2]) { @@ -825,7 +825,7 @@ bin_compset(char *name, char **argv, char *ops, int func) na = 2; } else { if (!(sa = argv[1])) { - zerrnam(name, "missing string for option -%c", NULL, argv[0][1]); + zwarnnam(name, "missing string for option -%c", NULL, argv[0][1]); return 1; } sb = argv[2]; @@ -833,7 +833,7 @@ bin_compset(char *name, char **argv, char *ops, int func) } if (((test == CVT_PRENUM || test == CVT_SUFNUM) ? !!sb : (sb && argv[na]))) { - zerrnam(name, "too many arguments", NULL, 0); + zwarnnam(name, "too many arguments", NULL, 0); return 1; } switch (test) { diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index 7d8f63fe0..38996193b 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -127,7 +127,7 @@ cd_init(char *nam, char *sep, char **args, int disp) setp = &(set->next); if (!(ap = get_user_var(*args))) { - zerrnam(nam, "invalid argument: %s", *args, 0); + zwarnnam(nam, "invalid argument: %s", *args, 0); return 1; } set->strs = zarrdup(ap); @@ -137,7 +137,7 @@ cd_init(char *nam, char *sep, char **args, int disp) if (*++args && **args != '-') { if (!(ap = get_user_var(*args))) { - zerrnam(nam, "invalid argument: %s", *args, 0); + zwarnnam(nam, "invalid argument: %s", *args, 0); return 1; } set->matches = zarrdup(ap); @@ -250,11 +250,11 @@ static int bin_compdescribe(char *nam, char **args, char *ops, int func) { if (incompfunc != 1) { - zerrnam(nam, "can only be called from completion function", NULL, 0); + zwarnnam(nam, "can only be called from completion function", NULL, 0); return 1; } if (!args[0][0] || !args[0][1] || args[0][2]) { - zerrnam(nam, "invalid argument: %s", args[0], 0); + zwarnnam(nam, "invalid argument: %s", args[0], 0); return 1; } switch (args[0][1]) { @@ -269,17 +269,17 @@ bin_compdescribe(char *nam, char **args, char *ops, int func) int n = arrlen(args); if (n != 6) { - zerrnam(nam, (n < 6 ? "not enough arguments" : + zwarnnam(nam, (n < 6 ? "not enough arguments" : "too many arguments"), NULL, 0); return 1; } return cd_get(args + 1); } else { - zerrnam(nam, "no parsed state", NULL, 0); + zwarnnam(nam, "no parsed state", NULL, 0); return 1; } } - zerrnam(nam, "invalid option: %s", args[0], 0); + zwarnnam(nam, "invalid option: %s", args[0], 0); return 1; } @@ -584,7 +584,7 @@ parse_cadef(char *nam, char **args) /* Oops, end-of-string. */ if (*p != ')') { freecadef(ret); - zerrnam(nam, "invalid argument: %s", *args, 0); + zwarnnam(nam, "invalid argument: %s", *args, 0); return NULL; } xor = (char **) zalloc((xnum + 2) * sizeof(char *)); @@ -627,7 +627,7 @@ parse_cadef(char *nam, char **args) } if (!p[1]) { freecadef(ret); - zerrnam(nam, "invalid argument: %s", *args, 0); + zwarnnam(nam, "invalid argument: %s", *args, 0); return NULL; } @@ -659,7 +659,7 @@ parse_cadef(char *nam, char **args) if (!*p) { freecadef(ret); - zerrnam(nam, "invalid option definition: %s", *args, 0); + zwarnnam(nam, "invalid option definition: %s", *args, 0); return NULL; } *p++ = '\0'; @@ -669,7 +669,7 @@ parse_cadef(char *nam, char **args) if (c && c != ':') { freecadef(ret); - zerrnam(nam, "invalid option definition: %s", *args, 0); + zwarnnam(nam, "invalid option definition: %s", *args, 0); return NULL; } /* Add the option name to the xor list if not `*-...'. */ @@ -713,7 +713,7 @@ parse_cadef(char *nam, char **args) if (*p != ':') { freecadef(ret); freecaargs(oargs); - zerrnam(nam, "invalid option definition: %s", + zwarnnam(nam, "invalid option definition: %s", *args, 0); return NULL; } @@ -790,12 +790,12 @@ parse_cadef(char *nam, char **args) if (*++p != ':') { freecadef(ret); - zerrnam(nam, "invalid rest argument definition: %s", *args, 0); + zwarnnam(nam, "invalid rest argument definition: %s", *args, 0); return NULL; } if (ret->rest) { freecadef(ret); - zerrnam(nam, "doubled rest argument definition: %s", *args, 0); + zwarnnam(nam, "doubled rest argument definition: %s", *args, 0); return NULL; } if (*++p == ':') { @@ -826,7 +826,7 @@ parse_cadef(char *nam, char **args) if (*p != ':') { freecadef(ret); - zerrnam(nam, "invalid argument: %s", *args, 0); + zwarnnam(nam, "invalid argument: %s", *args, 0); return NULL; } if (*++p == ':') { @@ -845,7 +845,7 @@ parse_cadef(char *nam, char **args) if (tmp && tmp->num == anum - 1) { freecadef(ret); freecaargs(arg); - zerrnam(nam, "doubled argument definition: %s", *args, 0); + zwarnnam(nam, "doubled argument definition: %s", *args, 0); return NULL; } arg->next = tmp; @@ -1305,15 +1305,15 @@ bin_comparguments(char *nam, char **args, char *ops, int func) int min, max, n; if (incompfunc != 1) { - zerrnam(nam, "can only be called from completion function", NULL, 0); + zwarnnam(nam, "can only be called from completion function", NULL, 0); return 1; } if (args[0][0] != '-' || !args[0][1] || args[0][2]) { - zerrnam(nam, "invalid argument: %s", args[0], 0); + zwarnnam(nam, "invalid argument: %s", args[0], 0); return 1; } if (args[0][1] != 'i' && !ca_parsed) { - zerrnam(nam, "no parsed state", NULL, 0); + zwarnnam(nam, "no parsed state", NULL, 0); return 1; } switch (args[0][1]) { @@ -1327,15 +1327,15 @@ bin_comparguments(char *nam, char **args, char *ops, int func) case 'a': min = 0; max = 0; break; case 'W': min = 2; max = 2; 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]) { @@ -1589,7 +1589,7 @@ parse_cvdef(char *nam, char **args) if (args[0][0] == '-' && args[0][1] == 's' && !args[0][2]) { if (args[1][0] && args[1][1]) { - zerrnam(nam, "invalid separator: %s", args[1], 0); + zwarnnam(nam, "invalid separator: %s", args[1], 0); return NULL; } hassep = 1; @@ -1597,7 +1597,7 @@ parse_cvdef(char *nam, char **args) args += 2; } if (!args[0] || !args[1]) { - zerrnam(nam, "not enough arguments", NULL, 0); + zwarnnam(nam, "not enough arguments", NULL, 0); return NULL; } descr = *args++; @@ -1640,7 +1640,7 @@ parse_cvdef(char *nam, char **args) } if (*p != ')') { freecvdef(ret); - zerrnam(nam, "invalid argument: %s", *args, 0); + zwarnnam(nam, "invalid argument: %s", *args, 0); return NULL; } xor = (char **) zalloc((xnum + 2) * sizeof(char *)); @@ -1664,7 +1664,7 @@ parse_cvdef(char *nam, char **args) if (hassep && !sep && name + 1 != p) { freecvdef(ret); - zerrnam(nam, "no multi-letter values with empty separator allowed", NULL, 0); + zwarnnam(nam, "no multi-letter values with empty separator allowed", NULL, 0); return NULL; } /* Optional description? */ @@ -1677,7 +1677,7 @@ parse_cvdef(char *nam, char **args) if (!*p) { freecvdef(ret); - zerrnam(nam, "invalid value definition: %s", *args, 0); + zwarnnam(nam, "invalid value definition: %s", *args, 0); return NULL; } *p++ = '\0'; @@ -1688,7 +1688,7 @@ parse_cvdef(char *nam, char **args) } if (c && c != ':') { freecvdef(ret); - zerrnam(nam, "invalid value definition: %s", *args, 0); + zwarnnam(nam, "invalid value definition: %s", *args, 0); return NULL; } if (!multi) { @@ -1703,7 +1703,7 @@ parse_cvdef(char *nam, char **args) if (c == ':') { if (hassep && !sep) { freecvdef(ret); - zerrnam(nam, "no value with argument with empty separator allowed", NULL, 0); + zwarnnam(nam, "no value with argument with empty separator allowed", NULL, 0); return NULL; } if (*++p == ':') { @@ -1921,15 +1921,15 @@ bin_compvalues(char *nam, char **args, char *ops, int func) int min, max, n; if (incompfunc != 1) { - zerrnam(nam, "can only be called from completion function", NULL, 0); + zwarnnam(nam, "can only be called from completion function", NULL, 0); return 1; } if (args[0][0] != '-' || !args[0][1] || args[0][2]) { - zerrnam(nam, "invalid argument: %s", args[0], 0); + zwarnnam(nam, "invalid argument: %s", args[0], 0); return 1; } if (args[0][1] != 'i' && !cv_parsed) { - zerrnam(nam, "no parsed state", NULL, 0); + zwarnnam(nam, "no parsed state", NULL, 0); return 1; } switch (args[0][1]) { @@ -1942,15 +1942,15 @@ bin_compvalues(char *nam, char **args, char *ops, int func) case 'L': min = 3; max = 4; break; case 'v': min = 1; max = 1; 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]) { @@ -2227,19 +2227,19 @@ bin_comptags(char *nam, char **args, char *ops, int func) int min, max, n; if (incompfunc != 1) { - zerrnam(nam, "can only be called from completion function", NULL, 0); + zwarnnam(nam, "can only be called from completion function", NULL, 0); return 1; } if (args[0][0] != '-' || !args[0][1] || args[0][2]) { - zerrnam(nam, "invalid argument: %s", args[0], 0); + zwarnnam(nam, "invalid argument: %s", args[0], 0); return 1; } if (locallevel >= MAX_TAGS) { - zerrnam(nam, "nesting level too deep", NULL, 0); + zwarnnam(nam, "nesting level too deep", NULL, 0); return 1; } if (args[0][1] != 'i' && !comptags[locallevel]) { - zerrnam(nam, "no tags registered", NULL, 0); + zwarnnam(nam, "no tags registered", NULL, 0); return 1; } switch (args[0][1]) { @@ -2250,15 +2250,15 @@ bin_comptags(char *nam, char **args, char *ops, int func) case 'R': min = 1; max = 1; break; case 'S': min = 1; max = 1; 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]) { @@ -2309,11 +2309,11 @@ static int bin_comptry(char *nam, char **args, char *ops, int func) { if (incompfunc != 1) { - zerrnam(nam, "can only be called from completion function", NULL, 0); + zwarnnam(nam, "can only be called from completion function", NULL, 0); return 1; } if (!lasttaglevel || !comptags[lasttaglevel]) { - zerrnam(nam, "no tags registered", NULL, 0); + zwarnnam(nam, "no tags registered", NULL, 0); return 1; } if (*args) { @@ -2387,7 +2387,7 @@ bin_compfmt(char *nam, char **args, char *ops, int func) for (args += 2; *args; args++) { if (args[0][1] != ':') { - zerrnam(nam, "invalid argument `%s'", args[0], 0); + zwarnnam(nam, "invalid argument `%s'", args[0], 0); return 1; } str = fmtstr(str, **args, *args + 2); diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 1ba625685..aa5086597 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -826,7 +826,7 @@ bin_vared(char *name, char **args, char *ops, int func) if (SHTTY == -1) { /* need to open /dev/tty specially */ if ((SHTTY = open("/dev/tty", O_RDWR|O_NOCTTY)) == -1) { - zerrnam(name, "can't access terminal", NULL, 0); + zwarnnam(name, "can't access terminal", NULL, 0); return 1; } oshout = shout; diff --git a/Src/Zle/zle_thingy.c b/Src/Zle/zle_thingy.c index 8cad90e2b..1d1eaacf3 100644 --- a/Src/Zle/zle_thingy.c +++ b/Src/Zle/zle_thingy.c @@ -349,7 +349,7 @@ bin_zle(char *name, char **args, char *ops, int func) if(op->o) for(opp = op; (++opp)->o; ) if(ops[STOUC(opp->o)]) { - zerrnam(name, "incompatible operation selection options", + zwarnnam(name, "incompatible operation selection options", NULL, 0); return 1; } @@ -357,10 +357,10 @@ bin_zle(char *name, char **args, char *ops, int func) /* check number of arguments */ for(n = 0; args[n]; n++) ; if(n < op->min) { - zerrnam(name, "not enough arguments for -%c", NULL, op->o); + zwarnnam(name, "not enough arguments for -%c", NULL, op->o); return 1; } else if(op->max != -1 && n > op->max) { - zerrnam(name, "too many arguments for -%c", NULL, op->o); + zwarnnam(name, "too many arguments for -%c", NULL, op->o); return 1; } @@ -397,7 +397,7 @@ bin_zle_refresh(char *name, char **args, char *ops, char func) int sl = statusll, ocl = clearlist; if (!zleactive) { - zerrnam(name, "can only be called from widget function", NULL, 0); + zwarnnam(name, "can only be called from widget function", NULL, 0); return 1; } statusline = NULL; @@ -441,7 +441,7 @@ static int bin_zle_mesg(char *name, char **args, char *ops, char func) { if (!zleactive) { - zerrnam(name, "can only be called from widget function", NULL, 0); + zwarnnam(name, "can only be called from widget function", NULL, 0); return 1; } showmsg(*args); @@ -457,7 +457,7 @@ bin_zle_unget(char *name, char **args, char *ops, char func) char *b = *args, *p = b + strlen(b); if (!zleactive) { - zerrnam(name, "can only be called from widget function", NULL, 0); + zwarnnam(name, "can only be called from widget function", NULL, 0); return 1; } while (p > b) @@ -534,10 +534,10 @@ bin_zle_link(char *name, char **args, char *ops, char func) Thingy t = (Thingy) thingytab->getnode(thingytab, args[0]); if(!t) { - zerrnam(name, "no such widget `%s'", args[0], 0); + zwarnnam(name, "no such widget `%s'", args[0], 0); return 1; } else if(bindwidget(t->widget, rthingy(args[1]))) { - zerrnam(name, "widget name `%s' is protected", args[1], 0); + zwarnnam(name, "widget name `%s' is protected", args[1], 0); return 1; } return 0; @@ -556,7 +556,7 @@ bin_zle_new(char *name, char **args, char *ops, char func) if(!bindwidget(w, rthingy(args[0]))) return 0; freewidget(w); - zerrnam(name, "widget name `%s' is protected", args[0], 0); + zwarnnam(name, "widget name `%s' is protected", args[0], 0); return 1; } @@ -568,14 +568,14 @@ bin_zle_complete(char *name, char **args, char *ops, char func) Widget w, cw; if (!require_module(name, "zsh/complete", 0, 0)) { - zerrnam(name, "can't load complete module", NULL, 0); + zwarnnam(name, "can't load complete module", NULL, 0); return 1; } t = rthingy((args[1][0] == '.') ? args[1] : dyncat(".", args[1])); cw = t->widget; unrefthingy(t); if (!cw || !(cw->flags & ZLE_ISCOMP)) { - zerrnam(name, "invalid widget `%s'", args[1], 0); + zwarnnam(name, "invalid widget `%s'", args[1], 0); return 1; } w = zalloc(sizeof(*w)); @@ -586,7 +586,7 @@ bin_zle_complete(char *name, char **args, char *ops, char func) w->u.comp.func = ztrdup(args[2]); if (bindwidget(w, rthingy(args[0]))) { freewidget(w); - zerrnam(name, "widget name `%s' is protected", args[0], 0); + zwarnnam(name, "widget name `%s' is protected", args[0], 0); return 1; } return 0; @@ -608,7 +608,7 @@ bin_zle_call(char *name, char **args, char *ops, char func) sfcontext != SFC_WIDGET); } if(!zleactive || incompctlfunc || incompfunc || sfcontext != SFC_WIDGET) { - zerrnam(name, "widgets can only be called when ZLE is active", + zwarnnam(name, "widgets can only be called when ZLE is active", NULL, 0); return 1; } -- cgit 1.4.1