diff options
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/compcore.c | 2 | ||||
| -rw-r--r-- | Src/Zle/computil.c | 15 | ||||
| -rw-r--r-- | Src/Zle/zle_main.c | 6 | ||||
| -rw-r--r-- | Src/Zle/zle_refresh.c | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index d1cf7a08a..5fc15b0d3 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -1971,7 +1971,7 @@ get_user_var(char *nam) char **arr = NULL, *val; queue_signals(); - if ((arr = getaparam(nam)) || (arr = gethparam(nam))) + if ((arr = getaparam(nam, NULL)) || (arr = gethparam(nam))) arr = (incompfunc ? arrdup(arr) : arr); else if ((val = getsparam(nam))) { arr = (char **) zhalloc(2*sizeof(char *)); diff --git a/Src/Zle/computil.c b/Src/Zle/computil.c index e704f9ffa..7ffe00df4 100644 --- a/Src/Zle/computil.c +++ b/Src/Zle/computil.c @@ -871,7 +871,7 @@ bin_compdescribe(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) } else { char **opts; - if (!(opts = getaparam(args[4]))) { + if (!(opts = getaparam(args[4], NULL))) { zwarnnam(nam, "unknown parameter: %s", args[4]); return 1; } @@ -4929,17 +4929,16 @@ bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) return 1; } queue_signals(); - if (!(tmp = getaparam(args[1]))) { - unqueue_signals(); + if (!(tmp = getaparam(args[1], NULL))) { zwarnnam(nam, "unknown parameter: %s", args[1]); return 0; } for (l = newlinklist(); *tmp; tmp++) addlinknode(l, quotestring(*tmp, QT_BACKSLASH_PATTERN)); set_list_array(args[1], cf_pats((args[0][1] == 'P'), !!args[0][2], - l, getaparam(args[2]), args[3], + l, getaparam(args[2], NULL), args[3], args[4], args[5], - getaparam(args[6]), args + 7)); + getaparam(args[6], NULL), args + 7)); unqueue_signals(); return 0; } @@ -4960,12 +4959,12 @@ bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) return 1; } queue_signals(); - tmp = getaparam(args[2]); + tmp = getaparam(args[2], NULL); l = newlinklist(); if (tmp) for (; *tmp; tmp++) addlinknode(l, *tmp); - if (!(tmp = getaparam(args[1]))) { + if (!(tmp = getaparam(args[1], NULL))) { unqueue_signals(); zwarnnam(nam, "unknown parameter: %s", args[1]); return 0; @@ -4990,7 +4989,7 @@ bin_compfiles(char *nam, char **args, UNUSED(Options ops), UNUSED(int func)) return 1; } queue_signals(); - if (!(tmp = getaparam(args[1]))) { + if (!(tmp = getaparam(args[1], NULL))) { unqueue_signals(); zwarnnam(nam, "unknown parameter: %s", args[1]); return 0; diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 6c271b5d0..dda2f56e6 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1193,6 +1193,7 @@ char * zleread(char **lp, char **rp, int flags, int context, char *init, char *finish) { char *s, **bracket; + int bracket_len; int old_errno = errno; int tmout = getiparam("TMOUT"); @@ -1328,7 +1329,8 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish) if (zleline && *zleline) redrawhook(); - if ((bracket = getaparam("zle_bracketed_paste")) && arrlen(bracket) == 2) + if ((bracket = getaparam("zle_bracketed_paste", &bracket_len)) && + bracket_len == 2) fputs(*bracket, shout); zrefresh(); @@ -1340,7 +1342,7 @@ zleread(char **lp, char **rp, int flags, int context, char *init, char *finish) "ZLE_VARED_ABORTED" : "ZLE_LINE_ABORTED", zlegetline(NULL, NULL)); - if ((bracket = getaparam("zle_bracketed_paste")) && arrlen(bracket) == 2) + if ((bracket = getaparam("zle_bracketed_paste", &bracket_len)) && bracket_len == 2) fputs(bracket[1], shout); if (done && !exit_pending && !errflag) diff --git a/Src/Zle/zle_refresh.c b/Src/Zle/zle_refresh.c index d0dd1ef06..a64e2f29e 100644 --- a/Src/Zle/zle_refresh.c +++ b/Src/Zle/zle_refresh.c @@ -313,7 +313,7 @@ static const REFRESH_ELEMENT zr_start_ellipsis[] = { static void zle_set_highlight(void) { - char **atrs = getaparam("zle_highlight"); + char **atrs = getaparam("zle_highlight", NULL); int special_atr_on_set = 0; int region_atr_on_set = 0; int isearch_atr_on_set = 0; |