diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2017-05-28 12:29:29 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-05-28 12:29:29 -0700 |
| commit | bcdfcb27654c95ac0a251594d69d6ac1f3e9e481 (patch) | |
| tree | 5919471d97a778ec2402dba49d1210a1bfb4dd7f /Src/utils.c | |
| parent | 11304f731899275826b4efd52349cfe33684502a (diff) | |
| parent | f4ab07b48c747e8dade9ee85369445de3a10d669 (diff) | |
| download | zsh-bcdfcb27654c95ac0a251594d69d6ac1f3e9e481.tar.gz zsh-bcdfcb27654c95ac0a251594d69d6ac1f3e9e481.tar.xz zsh-bcdfcb27654c95ac0a251594d69d6ac1f3e9e481.zip | |
Merge branch 'mikachu/badarrays' into schaefer/badarrays
Diffstat (limited to 'Src/utils.c')
| -rw-r--r-- | Src/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/utils.c b/Src/utils.c index acb891d82..579ab3be8 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -1501,7 +1501,7 @@ callhookfunc(char *name, LinkList lnklst, int arrayp, int *retval) memcpy(arrnam, name, namlen); memcpy(arrnam + namlen, HOOK_SUFFIX, HOOK_SUFFIX_LEN); - if ((arrptr = getaparam(arrnam))) { + if ((arrptr = getaparam(arrnam, NULL))) { arrptr = arrdup(arrptr); for (; *arrptr; arrptr++) { if ((shfunc = getshfunc(*arrptr))) { @@ -3810,7 +3810,7 @@ subst_string_by_func(Shfunc func, char *arg1, char *orig) if (doshfunc(func, l, 1)) ret = NULL; else - ret = getaparam("reply"); + ret = getaparam("reply", NULL); sfcontext = osc; stopmsg = osm; @@ -3842,7 +3842,7 @@ subst_string_by_hook(char *name, char *arg1, char *orig) memcpy(arrnam, name, namlen); memcpy(arrnam + namlen, HOOK_SUFFIX, HOOK_SUFFIX_LEN); - if ((arrptr = getaparam(arrnam))) { + if ((arrptr = getaparam(arrnam, NULL))) { /* Guard against internal modification of the array */ arrptr = arrdup(arrptr); for (; *arrptr; arrptr++) { |