Changeset 1203 for trunk/src/kash/exec.c

Timestamp:

Oct 7, 2007, 3:39:01 AM (18 years ago)

Author:

bird

Message:

converted a few more files.

File:

• trunk/src/kash/exec.c (modified) (63 diffs)

trunk/src/kash/exec.c

@@ -86 +86 @@
 #endif
 
-
-#define CMDTABLESIZE 31         /* should be prime */
-#define ARB 1                   /* actual size determined at run time */
-
-
-
-struct tblentry {
-        struct tblentry *next;  /* next entry in hash chain */
-        union param param;      /* definition of builtin function */
-        short cmdtype;          /* index identifying command */
-        char rehash;            /* if set, cd done since entry created */
-        char cmdname[ARB];      /* name of command */
-};
-
-
-STATIC struct tblentry *cmdtable[CMDTABLESIZE];
-STATIC int builtinloc = -1;             /* index in path of %builtin, or -1 */
-int exerrno = 0;                        /* Last exec error */
-
-
-STATIC void tryexec(char *, char **, char **, int, int);
-STATIC void execinterp(char **, char **);
-STATIC void printentry(struct tblentry *, int);
-STATIC void clearcmdentry(int);
-STATIC struct tblentry *cmdlookup(const char *, int);
-STATIC void delete_cmd_entry(void);
+#include "shinstance.h"
+
+//#define CMDTABLESIZE 31               /* should be prime */
+//#define ARB 1                 /* actual size determined at run time */
+//
+//
+//
+//struct tblentry {
+//      struct tblentry *next;  /* next entry in hash chain */
+//      union param param;      /* definition of builtin function */
+//      short cmdtype;          /* index identifying command */
+//      char rehash;            /* if set, cd done since entry created */
+//      char cmdname[ARB];      /* name of command */
+//};
+//
+//
+//STATIC struct tblentry *cmdtable[CMDTABLESIZE];
+//STATIC int builtinloc = -1;           /* index in path of %builtin, or -1 */
+//int exerrno = 0;                      /* Last exec error */
+
+
+STATIC void tryexec(shinstance *, char *, char **, char **, int, int);
+STATIC void execinterp(shinstance *, char **, char **);
+STATIC void printentry(shinstance *, struct tblentry *, int);
+STATIC void clearcmdentry(shinstance *, int);
+STATIC struct tblentry *cmdlookup(shinstance *, const char *, int);
+STATIC void delete_cmd_entry(shinstance *);
 #ifdef PC_EXE_EXTS
-STATIC int stat_pc_exec_exts(char *fullname, struct stat *st, int has_ext);
+STATIC int stat_pc_exec_exts(shinstance *, char *fullname, struct stat *st, int has_ext);
 #endif
 
@@ -125 +126 @@
 
 void
-shellexec(char **argv, char **envp, const char *path, int idx, int vforked)
+shellexec(shinstance *psh, char **argv, char **envp, const char *path, int idx, int vforked)
 {
         char *cmdname;
         int e;
 #ifdef PC_EXE_EXTS
-        int has_ext = strlen(argv[0]) - 4;
+        int has_ext = (int)strlen(argv[0]) - 4;
         has_ext = has_ext > 0
             && argv[0][has_ext] == '.'
@@ -148 +149 @@
                 cmdname = stalloc(psh, strlen(argv[0]) + 5);
                 strcpy(cmdname, argv[0]);
-                tryexec(cmdname, argv, envp, vforked, has_ext);
+                tryexec(psh, cmdname, argv, envp, vforked, has_ext);
                 TRACE((psh, "shellexec: cmdname=%s\n", cmdname));
                 stunalloc(psh, cmdname);
@@ -155 +156 @@
                 e = ENOENT;
                 while ((cmdname = padvance(psh, &path, argv[0])) != NULL) {
-                        if (--idx < 0 && pathopt == NULL) {
-                                tryexec(cmdname, argv, envp, vforked, has_ext);
+                        if (--idx < 0 && psh->pathopt == NULL) {
+                                tryexec(psh, cmdname, argv, envp, vforked, has_ext);
                                 if (errno != ENOENT && errno != ENOTDIR)
                                         e = errno;
@@ -167 +168 @@
         switch (e) {
         case EACCES:
-                exerrno = 126;
+                psh->exerrno = 126;
                 break;
         case ENOENT:
-                exerrno = 127;
+                psh->exerrno = 127;
                 break;
         default:
-                exerrno = 2;
+                psh->exerrno = 2;
                 break;
         }
         TRACE((psh, "shellexec failed for '%s', errno %d, vforked %d, suppressint %d\n",
-                argv[0], e, vforked, suppressint ));
+                argv[0], e, vforked, psh->suppressint ));
         exerror(psh, EXEXEC, "%s: %s", argv[0], errmsg(psh, e, E_EXEC));
         /* NOTREACHED */
@@ -184 +185 @@
 
 STATIC void
-tryexec(char *cmd, char **argv, char **envp, int vforked, int has_ext)
+tryexec(shinstance *psh, char *cmd, char **argv, char **envp, int vforked, int has_ext)
 {
         int e;
@@ -196 +197 @@
         struct stat st;
         if (!has_ext)
-            stat_pc_exec_exts(cmd, &st, 0);
+            stat_pc_exec_exts(psh, cmd, &st, 0);
 #endif
 #if defined __INNOTEK_LIBC__ && defined EXEC_HASH_BANG_SCRIPT
@@ -204 +205 @@
 #ifdef SYSV
         do {
-                execve(cmd, argv, envp);
+                sh_execve(psh, cmd, argv, envp);
         } while (errno == EINTR);
 #else
-        execve(cmd, argv, envp);
+        sh_execve(psh, cmd, argv, envp);
 #endif
         e = errno;
@@ -220 +221 @@
                 initshellproc(psh);
                 setinputfile(psh, cmd, 0);
-                commandname = arg0 = savestr(argv[0]);
+                psh->commandname = psh->arg0 = savestr(argv[0]);
 #ifdef EXEC_HASH_BANG_SCRIPT
                 pgetc(psh); pungetc(psh);               /* fill up input buffer */
-                p = parsenextc;
-                if (parsenleft > 2 && p[0] == '#' && p[1] == '!') {
+                p = psh->parsenextc;
+                if (psh->parsenleft > 2 && p[0] == '#' && p[1] == '!') {
                         argv[0] = cmd;
-                        execinterp(argv, envp);
+                        execinterp(psh, argv, envp);
                 }
 #endif
@@ -250 +251 @@
 
 STATIC void
-execinterp(char **argv, char **envp)
+execinterp(shinstance *psh, char **argv, char **envp)
 {
         int n;
@@ -263 +264 @@
         char **new;
 
-        n = parsenleft - 2;
-        inp = parsenextc + 2;
+        n = psh->parsenleft - 2;
+        inp = psh->parsenextc + 2;
         ap = newargs;
         for (;;) {
@@ -310 +311 @@
         while (*ap2++ = *ap++);
         TRACE((psh, "hash bang '%s'\n", new[0]));
-        shellexec(psh, new, envp, pathval(), 0, 0);
+        shellexec(psh, new, envp, pathval(psh), 0, 0);
         /* NOTREACHED */
 }
@@ -323 +324 @@
  * the possible path expansions in sequence.  If an option (indicated by
  * a percent sign) appears in the path entry then the global variable
- * pathopt will be set to point to it; otherwise pathopt will be set to
+ * psh->pathopt will be set to point to it; otherwise psh->pathopt will be set to
  * NULL.
  */
 
-const char *pathopt;
+//const char *pathopt;
 
 char *
-padvance(const char **path, const char *name)
+padvance(shinstance *psh, const char **path, const char *name)
 {
         const char *p;
@@ -345 +346 @@
         for (p = start ; *p && *p != ':' && *p != '%' ; p++);
 #endif
-        len = p - start + strlen(name) + 2;     /* "2" is for '/' and '\0' */
+        len = (int)(p - start + strlen(name) + 2);      /* "2" is for '/' and '\0' */
 #ifdef PC_EXE_EXTS
         len += 4; /* "4" is for .exe/.com/.cmd/.bat/.btm */
@@ -358 +359 @@
         }
         strcpy(q, name);
-        pathopt = NULL;
+        psh->pathopt = NULL;
         if (*p == '%') {
-                pathopt = ++p;
+                psh->pathopt = ++p;
 #ifdef PC_PATH_SEP
                 while (*p && *p != ';')  p++;
@@ -380 +381 @@
 
 #ifdef PC_EXE_EXTS
-STATIC int stat_pc_exec_exts(char *fullname, struct stat *st, int has_ext)
+STATIC int stat_pc_exec_exts(shinstance *psh, char *fullname, struct stat *st, int has_ext)
 {
     /* skip the SYSV crap */
-    if (stat(fullname, st) >= 0)
+    if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
         return 0;
     if (!has_ext && errno == ENOENT)
@@ -389 +390 @@
         char *psz = strchr(fullname, '\0');
         memcpy(psz, ".exe", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -395 +396 @@
 
         memcpy(psz, ".cmd", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -401 +402 @@
 
         memcpy(psz, ".bat", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -407 +408 @@
 
         memcpy(psz, ".com", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         if (errno != ENOENT && errno != ENOTDIR)
@@ -413 +414 @@
 
         memcpy(psz, ".btm", 5);
-        if (stat(fullname, st) >= 0)
+        if (shfile_stat(&psh->fdtab, fullname, st) >= 0)
             return 0;
         *psz = '\0';
@@ -427 +428 @@
 
 int
-hashcmd(int argc, char **argv)
+hashcmd(shinstance *psh, int argc, char **argv)
 {
         struct tblentry **pp;
@@ -439 +440 @@
         while ((c = nextopt(psh, "rv")) != '\0') {
                 if (c == 'r') {
-                        clearcmdentry(0);
+                        clearcmdentry(psh, 0);
                 } else if (c == 'v') {
                         verbose++;
                 }
         }
-        if (*argptr == NULL) {
-                for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+        if (*psh->argptr == NULL) {
+                for (pp = psh->cmdtable ; pp < &psh->cmdtable[CMDTABLESIZE] ; pp++) {
                         for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
                                 if (verbose || cmdp->cmdtype == CMDNORMAL)
-                                        printentry(cmdp, verbose);
+                                        printentry(psh, cmdp, verbose);
                         }
                 }
                 return 0;
         }
-        while ((name = *argptr) != NULL) {
-                if ((cmdp = cmdlookup(name, 0)) != NULL
+        while ((name = *psh->argptr) != NULL) {
+                if ((cmdp = cmdlookup(psh, name, 0)) != NULL
                  && (cmdp->cmdtype == CMDNORMAL
-                     || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
-                        delete_cmd_entry();
-                find_command(psh, name, &entry, DO_ERR, pathval());
+                     || (cmdp->cmdtype == CMDBUILTIN && psh->builtinloc >= 0)))
+                        delete_cmd_entry(psh);
+                find_command(psh, name, &entry, DO_ERR, pathval(psh));
                 if (verbose) {
                         if (entry.cmdtype != CMDUNKNOWN) {      /* if no error msg */
-                                cmdp = cmdlookup(name, 0);
-                                printentry(cmdp, verbose);
+                                cmdp = cmdlookup(psh, name, 0);
+                                printentry(psh, cmdp, verbose);
                         }
                         output_flushall(psh);
                 }
-                argptr++;
+                psh->argptr++;
         }
         return 0;
@@ -473 +474 @@
 
 STATIC void
-printentry(struct tblentry *cmdp, int verbose)
+printentry(shinstance *psh, struct tblentry *cmdp, int verbose)
 {
         int idx;
@@ -482 +483 @@
         case CMDNORMAL:
                 idx = cmdp->param.index;
-                path = pathval();
+                path = pathval(psh);
                 do {
                         name = padvance(psh, &path, cmdp->cmdname);
@@ -523 +524 @@
 
 void
-find_command(char *name, struct cmdentry *entry, int act, const char *path)
+find_command(shinstance *psh, char *name, struct cmdentry *entry, int act, const char *path)
 {
         struct tblentry *cmdp, loc_cmd;
@@ -531 +532 @@
         struct stat statb;
         int e;
-        int (*bltin)(int,char **);
+        int (*bltin)(shinstance*,int,char **);
 
 #ifdef PC_EXE_EXTS
-        int has_ext = strlen(name) - 4;
+        int has_ext = (int)(strlen(name) - 4);
         has_ext = has_ext > 0
             && name[has_ext] == '.'
@@ -550 +551 @@
         if (strchr(name, '/') != NULL) {
                 if (act & DO_ABS) {
-                        while (stat(name, &statb) < 0) {
+                        while (shfile_stat(&psh->fdtab, name, &statb) < 0) {
 #ifdef SYSV
                                 if (errno == EINTR)
@@ -570 +571 @@
         }
 
-        if (path != pathval())
+        if (path != pathval(psh))
                 act |= DO_ALTPATH;
 
@@ -577 +578 @@
 
         /* If name is in the table, check answer will be ok */
-        if ((cmdp = cmdlookup(name, 0)) != NULL) {
+        if ((cmdp = cmdlookup(psh, name, 0)) != NULL) {
                 do {
                         switch (cmdp->cmdtype) {
@@ -593 +594 @@
                                 break;
                         case CMDBUILTIN:
-                                if ((act & DO_ALTBLTIN) || builtinloc >= 0) {
+                                if ((act & DO_ALTBLTIN) || psh->builtinloc >= 0) {
                                         cmdp = NULL;
                                         continue;
@@ -606 +607 @@
 
         /* If %builtin not in path, check for builtin next */
-        if ((act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : builtinloc < 0) &&
+        if ((act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : psh->builtinloc < 0) &&
             (bltin = find_builtin(psh, name)) != 0)
                 goto builtin_success;
@@ -614 +615 @@
         if (cmdp) {             /* doing a rehash */
                 if (cmdp->cmdtype == CMDBUILTIN)
-                        prev = builtinloc;
+                        prev = psh->builtinloc;
                 else
                         prev = cmdp->param.index;
@@ -625 +626 @@
                 stunalloc(psh, fullname);
                 idx++;
-                if (pathopt) {
-                        if (prefix("builtin", pathopt)) {
+                if (psh->pathopt) {
+                        if (prefix("builtin", psh->pathopt)) {
                                 if ((bltin = find_builtin(psh, name)) == 0)
                                         goto loop;
                                 goto builtin_success;
-                        } else if (prefix("func", pathopt)) {
+                        } else if (prefix("func", psh->pathopt)) {
                                 /* handled below */
                         } else {
@@ -645 +646 @@
                 }
 #ifdef PC_EXE_EXTS
-                while (stat_pc_exec_exts(fullname, &statb, has_ext) < 0) {
+                while (stat_pc_exec_exts(psh, fullname, &statb, has_ext) < 0) {
 #else
-                while (stat(fullname, &statb) < 0) {
+                while (shfile_stat(&psh->fdtab, fullname, &statb) < 0) {
 #endif
 #ifdef SYSV
@@ -661 +662 @@
                 if (!S_ISREG(statb.st_mode))
                         goto loop;
-                if (pathopt) {          /* this is a %func directory */
+                if (psh->pathopt) {             /* this is a %func directory */
                         if (act & DO_NOFUNC)
                                 goto loop;
                         stalloc(psh, strlen(fullname) + 1);
                         readcmdfile(psh, fullname);
-                        if ((cmdp = cmdlookup(name, 0)) == NULL ||
+                        if ((cmdp = cmdlookup(psh, name, 0)) == NULL ||
                             cmdp->cmdtype != CMDFUNCTION)
                                 error(psh, "%s not defined in %s", name, fullname);
@@ -692 +693 @@
                         cmdp = &loc_cmd;
                 } else
-                        cmdp = cmdlookup(name, 1);
+                        cmdp = cmdlookup(psh, name, 1);
                 cmdp->cmdtype = CMDNORMAL;
                 cmdp->param.index = idx;
@@ -701 +702 @@
         /* We failed.  If there was an entry for this command, delete it */
         if (cmdp)
-                delete_cmd_entry();
+                delete_cmd_entry(psh);
         if (act & DO_ERR)
                 outfmt(psh->out2, "%s: %s\n", name, errmsg(psh, e, E_EXEC));
@@ -712 +713 @@
                 cmdp = &loc_cmd;
         else
-                cmdp = cmdlookup(name, 1);
+                cmdp = cmdlookup(psh, name, 1);
         if (cmdp->cmdtype == CMDFUNCTION)
                 /* DO_NOFUNC must have been set */
@@ -732 +733 @@
 
 int
-(*find_builtin(name))(int, char **)
-        char *name;
+(*find_builtin(shinstance *psh, char *name))(shinstance *psh, int, char **)
 {
         const struct builtincmd *bp;
@@ -745 +745 @@
 
 int
-(*find_splbltin(name))(int, char **)
-        char *name;
+(*find_splbltin(shinstance *psh, char *name))(shinstance *psh, int, char **)
 {
         const struct builtincmd *bp;
@@ -765 +764 @@
 
 void
-hash_special_builtins(void)
+hash_special_builtins(shinstance *psh)
 {
         const struct builtincmd *bp;
@@ -771 +770 @@
 
         for (bp = splbltincmd ; bp->name ; bp++) {
-                cmdp = cmdlookup(bp->name, 1);
+                cmdp = cmdlookup(psh, bp->name, 1);
                 cmdp->cmdtype = CMDSPLBLTIN;
                 cmdp->param.bltin = bp->builtin;
@@ -785 +784 @@
 
 void
-hashcd(void)
+hashcd(shinstance *psh)
 {
         struct tblentry **pp;
         struct tblentry *cmdp;
 
-        for (pp = cmdtable ; pp < &cmdtable[CMDTABLESIZE] ; pp++) {
+        for (pp = psh->cmdtable ; pp < &psh->cmdtable[CMDTABLESIZE] ; pp++) {
                 for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
                         if (cmdp->cmdtype == CMDNORMAL
-                         || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0))
+                         || (cmdp->cmdtype == CMDBUILTIN && psh->builtinloc >= 0))
                                 cmdp->rehash = 1;
                 }
@@ -804 +803 @@
  * Fix command hash table when PATH changed.
  * Called before PATH is changed.  The argument is the new value of PATH;
- * pathval() still returns the old value at this point.
+ * pathval(psh) still returns the old value at this point.
  * Called with interrupts off.
  */
 
 void
-changepath(const char *newval)
+changepath(shinstance *psh, const char *newval)
 {
         const char *old, *new;
@@ -816 +815 @@
         int bltin;
 
-        old = pathval();
+        old = pathval(psh);
         new = newval;
         firstchange = 9999;     /* assume no change */
@@ -847 +846 @@
                 new++, old++;
         }
-        if (builtinloc < 0 && bltin >= 0)
-                builtinloc = bltin;             /* zap builtins */
-        if (builtinloc >= 0 && bltin < 0)
+        if (psh->builtinloc < 0 && bltin >= 0)
+                psh->builtinloc = bltin;                /* zap builtins */
+        if (psh->builtinloc >= 0 && bltin < 0)
                 firstchange = 0;
-        clearcmdentry(firstchange);
-        builtinloc = bltin;
+        clearcmdentry(psh, firstchange);
+        psh->builtinloc = bltin;
 }
 
@@ -862 +861 @@
 
 STATIC void
-clearcmdentry(int firstchange)
+clearcmdentry(shinstance *psh, int firstchange)
 {
         struct tblentry **tblp;
@@ -869 +868 @@
 
         INTOFF;
-        for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
+        for (tblp = psh->cmdtable ; tblp < &psh->cmdtable[CMDTABLESIZE] ; tblp++) {
                 pp = tblp;
                 while ((cmdp = *pp) != NULL) {
@@ -875 +874 @@
                              cmdp->param.index >= firstchange)
                          || (cmdp->cmdtype == CMDBUILTIN &&
-                             builtinloc >= firstchange)) {
+                             psh->builtinloc >= firstchange)) {
                                 *pp = cmdp->next;
                                 ckfree(cmdp);
@@ -905 +904 @@
 
 void
-deletefuncs(void)
+deletefuncs(shinstance *psh)
 {
         struct tblentry **tblp;
@@ -912 +911 @@
 
         INTOFF;
-        for (tblp = cmdtable ; tblp < &cmdtable[CMDTABLESIZE] ; tblp++) {
+        for (tblp = psh->cmdtable ; tblp < &psh->cmdtable[CMDTABLESIZE] ; tblp++) {
                 pp = tblp;
                 while ((cmdp = *pp) != NULL) {
@@ -941 +940 @@
 
 STATIC struct tblentry *
-cmdlookup(const char *name, int add)
+cmdlookup(shinstance *psh, const char *name, int add)
 {
         int hashval;
@@ -953 +952 @@
                 hashval += *p++;
         hashval &= 0x7FFF;
-        pp = &cmdtable[hashval % CMDTABLESIZE];
+        pp = &psh->cmdtable[hashval % CMDTABLESIZE];
         for (cmdp = *pp ; cmdp ; cmdp = cmdp->next) {
                 if (equal(cmdp->cmdname, name))
@@ -978 +977 @@
 
 STATIC void
-delete_cmd_entry(void)
+delete_cmd_entry(shinstance *psh)
 {
         struct tblentry *cmdp;
@@ -993 +992 @@
 #ifdef notdef
 void
-getcmdentry(char *name, struct cmdentry *entry)
-{
-        struct tblentry *cmdp = cmdlookup(name, 0);
+getcmdentry(shinstance *psh, char *name, struct cmdentry *entry)
+{
+        struct tblentry *cmdp = cmdlookup(psh, name, 0);
 
         if (cmdp) {
@@ -1014 +1013 @@
 
 STATIC void
-addcmdentry(char *name, struct cmdentry *entry)
+addcmdentry(shinstance *psh, char *name, struct cmdentry *entry)
 {
         struct tblentry *cmdp;
 
         INTOFF;
-        cmdp = cmdlookup(name, 1);
+        cmdp = cmdlookup(psh, name, 1);
         if (cmdp->cmdtype != CMDSPLBLTIN) {
                 if (cmdp->cmdtype == CMDFUNCTION) {
@@ -1036 +1035 @@
 
 void
-defun(char *name, union node *func)
+defun(shinstance *psh,char *name, union node *func)
 {
         struct cmdentry entry;
@@ -1053 +1052 @@
 
 int
-unsetfunc(char *name)
+unsetfunc(shinstance *psh, char *name)
 {
         struct tblentry *cmdp;
 
-        if ((cmdp = cmdlookup(name, 0)) != NULL &&
+        if ((cmdp = cmdlookup(psh, name, 0)) != NULL &&
             cmdp->cmdtype == CMDFUNCTION) {
                 freefunc(cmdp->param.func);
-                delete_cmd_entry();
+                delete_cmd_entry(psh);
                 return (0);
         }
@@ -1072 +1071 @@
 
 int
-typecmd(int argc, char **argv)
+typecmd(shinstance *psh, int argc, char **argv)
 {
         struct cmdentry entry;
@@ -1096 +1095 @@
                 error(psh, "cannot specify -p with -v or -V");
 
-        while ((arg = *argptr++)) {
+        while ((arg = *psh->argptr++)) {
                 if (!v_flag)
                         out1str(psh, arg);
@@ -1121 +1120 @@
 
                 /* Then check if it is a tracked alias */
-                if ((cmdp = cmdlookup(arg, 0)) != NULL) {
+                if ((cmdp = cmdlookup(psh, arg, 0)) != NULL) {
                         entry.cmdtype = cmdp->cmdtype;
                         entry.u = cmdp->param;
                 } else {
                         /* Finally use brute force */
-                        find_command(psh, arg, &entry, DO_ABS, pathval());
+                        find_command(psh, arg, &entry, DO_ABS, pathval(psh));
                 }
 
@@ -1132 +1131 @@
                 case CMDNORMAL: {
                         if (strchr(arg, '/') == NULL) {
-                                const char *path = pathval();
+                                const char *path = pathval(psh);
                                 char *name;
                                 int j = entry.u.index;