Changeset 1200 in kBuild for trunk/src

Timestamp:

Oct 6, 2007 10:11:34 PM (17 years ago)

Author:

bird

Message:

Updating function calls.

Location:

trunk/src/kash

Files:

• exec.c (modified) (10 diffs)
• expand.c (modified) (1 diff)
• generated/init.c (modified) (2 diffs)
• histedit.c (modified) (2 diffs)
• trap.c (modified) (2 diffs)
• var.c (modified) (1 diff)

trunk/src/kash/exec.c

@@ -154 +154 @@
         } else {
                 e = ENOENT;
-                while ((cmdname = padvance(&path, argv[0])) != NULL) {
+                while ((cmdname = padvance(psh, &path, argv[0])) != NULL) {
                         if (--idx < 0 && pathopt == NULL) {
                                 tryexec(cmdname, argv, envp, vforked, has_ext);
@@ -310 +310 @@
         while (*ap2++ = *ap++);
         TRACE((psh, "hash bang '%s'\n", new[0]));
-        shellexec(new, envp, pathval(), 0, 0);
+        shellexec(psh, new, envp, pathval(), 0, 0);
         /* NOTREACHED */
 }
@@ -458 +458 @@
                      || (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
                         delete_cmd_entry();
-                find_command(name, &entry, DO_ERR, pathval());
+                find_command(psh, name, &entry, DO_ERR, pathval());
                 if (verbose) {
                         if (entry.cmdtype != CMDUNKNOWN) {      /* if no error msg */
@@ -484 +484 @@
                 path = pathval();
                 do {
-                        name = padvance(&path, cmdp->cmdname);
+                        name = padvance(psh, &path, cmdp->cmdname);
                         stunalloc(psh, name);
                 } while (--idx >= 0);
@@ -607 +607 @@
         /* If %builtin not in path, check for builtin next */
         if ((act & DO_ALTPATH ? !(act & DO_ALTBLTIN) : builtinloc < 0) &&
-            (bltin = find_builtin(name)) != 0)
+            (bltin = find_builtin(psh, name)) != 0)
                 goto builtin_success;
 
@@ -622 +622 @@
         idx = -1;
 loop:
-        while ((fullname = padvance(&path, name)) != NULL) {
+        while ((fullname = padvance(psh, &path, name)) != NULL) {
                 stunalloc(psh, fullname);
                 idx++;
                 if (pathopt) {
                         if (prefix("builtin", pathopt)) {
-                                if ((bltin = find_builtin(name)) == 0)
+                                if ((bltin = find_builtin(psh, name)) == 0)
                                         goto loop;
                                 goto builtin_success;
@@ -892 +892 @@
 
 #ifdef mkinit
-MKINIT void deletefuncs(void);
-MKINIT void hash_special_builtins(void);
+MKINIT void deletefuncs(struct shinstance *);
+MKINIT void hash_special_builtins(struct shinstance *);
 
 INIT {
-        hash_special_builtins();
+        hash_special_builtins(psh);
 }
 
 SHELLPROC {
-        deletefuncs();
+        deletefuncs(psh);
 }
 #endif
@@ -1043 +1043 @@
         entry.cmdtype = CMDFUNCTION;
         entry.u.func = copyfunc(func);
-        addcmdentry(name, &entry);
+        addcmdentry(psh, name, &entry);
         INTON;
 }
@@ -1126 +1126 @@
                 } else {
                         /* Finally use brute force */
-                        find_command(arg, &entry, DO_ABS, pathval());
+                        find_command(psh, arg, &entry, DO_ABS, pathval());
                 }
 
@@ -1136 +1136 @@
                                 int j = entry.u.index;
                                 do {
-                                        name = padvance(&path, arg);
+                                        name = padvance(psh, &path, arg);
                                         stunalloc(psh, name);
                                 } while (--j >= 0);

trunk/src/kash/expand.c

@@ -439 +439 @@
         psh->herefd = -1;
         p = grabstackstr(psh, dest);
-        evalbackcmd(cmd, &in);
+        evalbackcmd(psh, cmd, &in);
         ungrabstackstr(psh, p, dest);
         ifsfirst = saveifs;

trunk/src/kash/generated/init.c

@@ -122 +122 @@
 extern int loopnest;            /* current loop nesting level */
 
-extern void deletefuncs(void);
-extern void hash_special_builtins(void);
+extern void deletefuncs(struct shinstance *);
+extern void hash_special_builtins(struct shinstance *);
 
 struct strpush {
@@ -266 +266 @@
       /* from exec.c: */
       {
-              deletefuncs();
+              deletefuncs(psh);
       }
 

trunk/src/kash/histedit.c

@@ -418 +418 @@
                                 }
 
-                                evalstring(strcpy(stalloc(psh, strlen(s) + 1), s), 0);
+                                evalstring(psh, strcpy(stalloc(psh, strlen(s) + 1), s), 0);
                                 if (displayhist && hist) {
                                         /*
@@ -442 +442 @@
                 editcmd = stalloc(psh, strlen(editor) + strlen(editfile) + 2);
                 sprintf(editcmd, "%s %s", editor, editfile);
-                evalstring(editcmd, 0); /* XXX - should use no JC command */
+                evalstring(psh, editcmd, 0);    /* XXX - should use no JC command */
                 INTON;
                 readcmdfile(editfile);  /* XXX - should read back - quick tst */

trunk/src/kash/trap.c

@@ -408 +408 @@
                 gotsig[i - 1] = 0;
                 savestatus=exitstatus;
-                evalstring(trap[i], 0);
+                evalstring(psh, trap[i], 0);
                 exitstatus=savestatus;
         }
@@ -457 +457 @@
         if ((p = trap[0]) != NULL && *p != '\0') {
                 trap[0] = NULL;
-                evalstring(p, 0);
+                evalstring(psh, p, 0);
         }
 l1:   handler = &loc2;                  /* probably unnecessary */

trunk/src/kash/var.c

@@ -832 +832 @@
         for (ap = argptr; *ap ; ap++) {
                 if (flg_func)
-                        ret |= unsetfunc(*ap);
+                        ret |= unsetfunc(psh, *ap);
                 if (flg_var)
-                        ret |= unsetvar(*ap, flg_var == 'e');
+                        ret |= unsetvar(psh, *ap, flg_var == 'e');
         }
         return ret;