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

Timestamp:

Feb 27, 2009, 5:08:07 AM (16 years ago)

Author:

bird

Message:

kash: malloc/free/friends gets a psh.

File:

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

trunk/src/kash/exec.c

@@ -213 +213 @@
                 initshellproc(psh);
                 setinputfile(psh, cmd, 0);
-                psh->commandname = psh->arg0 = savestr(argv[0]);
+                psh->commandname = psh->arg0 = savestr(psh, argv[0]);
 #ifdef EXEC_HASH_BANG_SCRIPT
                 pgetc(psh); pungetc(psh);               /* fill up input buffer */
@@ -296 +296 @@
                 error(psh, "Bad #! line");
         for (ap2 = argv ; *ap2++ != NULL ; );
-        new = ckmalloc(i + ((char *)ap2 - (char *)argv));
+        new = ckmalloc(psh, i + ((char *)ap2 - (char *)argv));
         ap = newargs, ap2 = new;
         while ((i -= sizeof (char **)) >= 0)
@@ -868 +868 @@
                              psh->builtinloc >= firstchange)) {
                                 *pp = cmdp->next;
-                                ckfree(cmdp);
+                                ckfree(psh, cmdp);
                         } else {
                                 pp = &cmdp->next;
@@ -908 +908 @@
                         if (cmdp->cmdtype == CMDFUNCTION) {
                                 *pp = cmdp->next;
-                                freefunc(cmdp->param.func);
-                                ckfree(cmdp);
+                                freefunc(psh, cmdp->param.func);
+                                ckfree(psh, cmdp);
                         } else {
                                 pp = &cmdp->next;
@@ -952 +952 @@
         if (add && cmdp == NULL) {
                 INTOFF;
-                cmdp = *pp = ckmalloc(sizeof (struct tblentry) - ARB
+                cmdp = *pp = ckmalloc(psh, sizeof (struct tblentry) - ARB
                                         + strlen(name) + 1);
                 cmdp->next = NULL;
@@ -976 +976 @@
         cmdp = *lastcmdentry;
         *lastcmdentry = cmdp->next;
-        ckfree(cmdp);
+        ckfree(psh, cmdp);
         INTON;
 }
@@ -1013 +1013 @@
         if (cmdp->cmdtype != CMDSPLBLTIN) {
                 if (cmdp->cmdtype == CMDFUNCTION) {
-                        freefunc(cmdp->param.func);
+                        freefunc(psh, cmdp->param.func);
                 }
                 cmdp->cmdtype = entry->cmdtype;
@@ -1027 +1027 @@
 
 void
-defun(shinstance *psh,char *name, union node *func)
+defun(shinstance *psh, char *name, union node *func)
 {
         struct cmdentry entry;
@@ -1033 +1033 @@
         INTOFF;
         entry.cmdtype = CMDFUNCTION;
-        entry.u.func = copyfunc(func);
+        entry.u.func = copyfunc(psh, func);
         addcmdentry(psh, name, &entry);
         INTON;
@@ -1050 +1050 @@
         if ((cmdp = cmdlookup(psh, name, 0)) != NULL &&
             cmdp->cmdtype == CMDFUNCTION) {
-                freefunc(cmdp->param.func);
+                freefunc(psh, cmdp->param.func);
                 delete_cmd_entry(psh);
                 return (0);