Changeset 2290 for trunk/src/kash/var.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/var.c (modified) (16 diffs)

trunk/src/kash/var.c

@@ -209 +209 @@
         struct var **vpp;
 #ifdef PC_OS2_LIBPATHS
-        char *psz = ckmalloc(2048);
+        char *psz = ckmalloc(psh, 2048);
         int rc;
         int i;
@@ -232 +232 @@
                         int cch1 = strlen(libpath_envs[i]);
                         int cch2 = strlen(psz) + 1;
-                        psh->libpath_vars[i].text = ckmalloc(cch1 + cch2);
+                        psh->libpath_vars[i].text = ckmalloc(psh, cch1 + cch2);
                         memcpy(psh->libpath_vars[i].text, libpath_envs[i], cch1);
                         memcpy(psh->libpath_vars[i].text + cch1, psz, cch2);
@@ -246 +246 @@
                 *vpp = &psh->libpath_vars[i];
         }
-        free(psz);
+        ckfree(psh, psz);
 #endif
 
@@ -332 +332 @@
                 len += strlen(val);
         }
-        d = nameeq = ckmalloc(len);
+        d = nameeq = ckmalloc(psh, len);
         q = name;
         while (--namelen >= 0)
@@ -372 +372 @@
 
                 if ((vp->flags & (VTEXTFIXED|VSTACK)) == 0)
-                        ckfree(vp->text);
+                        ckfree(psh, vp->text);
 
                 vp->flags &= ~(VTEXTFIXED|VSTACK|VUNSET);
@@ -394 +394 @@
         if (flags & VNOSET)
                 return;
-        vp = ckmalloc(sizeof (*vp));
+        vp = ckmalloc(psh, sizeof (*vp));
         vp->flags = flags & ~VNOFUNC;
         vp->text = s;
@@ -416 +416 @@
         INTOFF;
         for (lp = list ; lp ; lp = lp->next) {
-                setvareq(psh, savestr(lp->text), flags);
+                setvareq(psh, savestr(psh, lp->text), flags);
         }
         INTON;
@@ -539 +539 @@
                                 *prev = vp->next;
                                 if ((vp->flags & VTEXTFIXED) == 0)
-                                        ckfree(vp->text);
+                                        ckfree(psh, vp->text);
                                 if ((vp->flags & VSTRFIXED) == 0)
-                                        ckfree(vp);
+                                        ckfree(psh, vp);
                         } else {
                                 if (vp->flags & VSTACK) {
-                                        vp->text = savestr(vp->text);
+                                        vp->text = savestr(psh, vp->text);
                                         vp->flags &=~ VSTACK;
                                 }
@@ -618 +618 @@
         if (!list) {
                 list_len = 32;
-                list = ckmalloc(list_len * sizeof(*list));
+                list = ckmalloc(psh, list_len * sizeof(*list));
         }
 
@@ -628 +628 @@
                                 continue;
                         if (count >= list_len) {
-                                list = ckrealloc(list,
+                                list = ckrealloc(psh, list,
                                         (list_len << 1) * sizeof(*list));
                                 list_len <<= 1;
@@ -723 +723 @@
 
         INTOFF;
-        lvp = ckmalloc(sizeof (struct localvar));
+        lvp = ckmalloc(psh, sizeof (struct localvar));
         if (name[0] == '-' && name[1] == '\0') {
                 char *p;
-                p = ckmalloc(sizeof_optlist);
+                p = ckmalloc(psh, sizeof_optlist);
                 lvp->text = memcpy(p, psh->optlist, sizeof_optlist);
                 vp = NULL;
@@ -733 +733 @@
                 if (vp == NULL) {
                         if (strchr(name, '='))
-                                setvareq(psh, savestr(name), VSTRFIXED|flags);
+                                setvareq(psh, savestr(psh, name), VSTRFIXED|flags);
                         else
                                 setvar(psh, name, NULL, VSTRFIXED|flags);
@@ -744 +744 @@
                         vp->flags |= VSTRFIXED|VTEXTFIXED;
                         if (name[vp->name_len] == '=')
-                                setvareq(psh, savestr(name), flags);
+                                setvareq(psh, savestr(psh, name), flags);
                 }
         }
@@ -770 +770 @@
                 if (vp == NULL) {       /* $- saved */
                         memcpy(psh->optlist, lvp->text, sizeof_optlist);
-                        ckfree(lvp->text);
+                        ckfree(psh, lvp->text);
                 } else if ((lvp->flags & (VUNSET|VSTRFIXED)) == VUNSET) {
                         (void)unsetvar(psh, vp->text, 0);
@@ -777 +777 @@
                                 (*vp->func)(psh, lvp->text + vp->name_len + 1);
                         if ((vp->flags & VTEXTFIXED) == 0)
-                                ckfree(vp->text);
+                                ckfree(psh, vp->text);
                         vp->flags = lvp->flags;
                         vp->text = lvp->text;
                 }
-                ckfree(lvp);
+                ckfree(psh, lvp);
         }
 }
@@ -860 +860 @@
                 if ((vp->flags & VSTRFIXED) == 0) {
                         if ((vp->flags & VTEXTFIXED) == 0)
-                                ckfree(vp->text);
+                                ckfree(psh, vp->text);
                         *vpp = vp->next;
-                        ckfree(vp);
+                        ckfree(psh, vp);
                 }
         }