summaryrefslogtreecommitdiff
path: root/Src/utils.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-09-29 15:18:49 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-09-29 15:18:49 +0000
commit28cf4041b4ed58ba2ae9860f9dfc138edcdbb34b (patch)
tree947534d0f5584a5c8ea2f92cd6ff92179ebb8b89 /Src/utils.c
parent59dd1491c64886492f2fd20e6929a890c844034a (diff)
downloadzsh-28cf4041b4ed58ba2ae9860f9dfc138edcdbb34b.tar.gz
zsh-28cf4041b4ed58ba2ae9860f9dfc138edcdbb34b.zip
25771: shell function context for substitution functions
Diffstat (limited to 'Src/utils.c')
-rw-r--r--Src/utils.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/Src/utils.c b/Src/utils.c
index fadf46470..5518a16c7 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2935,14 +2935,23 @@ getshfunc(char *nam)
char **
subst_string_by_func(Shfunc func, char *arg1, char *orig)
{
+ int osc = sfcontext;
LinkList l = newlinklist();
+ char **ret;
+
addlinknode(l, func->node.nam);
if (arg1)
addlinknode(l, arg1);
addlinknode(l, orig);
+ sfcontext = SFC_SUBST;
+
if (doshfunc(func, l, 1))
- return NULL;
- return getaparam("reply");
+ ret = NULL;
+ else
+ ret = getaparam("reply");
+
+ sfcontext = osc;
+ return ret;
}
/**/