From 76aef28b3147fb5ea944c793452e2d5ca3b348fe Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Thu, 15 Jul 2010 18:44:12 +0000 Subject: 28073: allow #! scripts to search path if interpreter not found --- Src/init.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'Src/init.c') diff --git a/Src/init.c b/Src/init.c index 06f177725..e85d3875a 100644 --- a/Src/init.c +++ b/Src/init.c @@ -949,25 +949,7 @@ setupshin(char *runscript) * With the PATHSCRIPT option, search the path if no * path was given in the script name. */ - char **pp, ppmaxlen = 0, *buf; - for (pp = path; *pp; pp++) - { - int len = strlen(*pp); - if (len > ppmaxlen) - ppmaxlen = len; - } - buf = zhalloc(ppmaxlen + strlen(runscript) + 2); - for (pp = path; *pp; pp++) { - sprintf(buf, "%s/%s", *pp, runscript); - /* careful, static buffer used in open() later */ - funmeta = unmeta(buf); - if (access(funmeta, F_OK) == 0 && - stat(funmeta, &st) >= 0 && - !S_ISDIR(st.st_mode)) { - sfname = buf; - break; - } - } + funmeta = pathprog(runscript, &sfname); } if (!sfname || (SHIN = movefd(open(funmeta, O_RDONLY | O_NOCTTY))) -- cgit 1.4.1