From 4d6097657cb8f19846c5b9e09069f6d4e43882e0 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Wed, 18 Jan 2017 09:57:55 +0000 Subject: 40375: autoload with explicit path mustn't trash already loaded function. Also remove unnecessary dupstring() on already duplicated string when expanding =cmd. --- Src/subst.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Src/subst.c') diff --git a/Src/subst.c b/Src/subst.c index 737a0a902..670f3f0c6 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -622,7 +622,7 @@ filesub(char **namptr, int assign) char * equalsubstr(char *str, int assign, int nomatch) { - char *pp, *cnam, *cmdstr, *ret; + char *pp, *cnam, *cmdstr; for (pp = str; !isend2(*pp); pp++) ; @@ -634,10 +634,10 @@ equalsubstr(char *str, int assign, int nomatch) zerr("%s not found", cmdstr); return NULL; } - ret = dupstring(cnam); if (*pp) - ret = dyncat(ret, pp); - return ret; + return dyncat(cnam, pp); + else + return cnam; /* already duplicated */ } /**/ -- cgit 1.4.1