From cfef2aabc1d9711be43effaf8a4f7ba65f5c5eb6 Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Fri, 22 Nov 2024 23:29:04 -0600
Subject: [PATCH] Cleanups and bugfixes. Leak less memory, pass tests with
 ASAN=1.

---
 toys/pending/sh.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/toys/pending/sh.c b/toys/pending/sh.c
index 473090f5..c81056e5 100644
--- a/toys/pending/sh.c
+++ b/toys/pending/sh.c
@@ -575,7 +575,7 @@ static char *getvar(char *s)
 // Append variable to ff->vars, returning *struct. Does not check duplicates.
 static struct sh_vars *addvar(char *s, struct sh_fcall *ff)
 {
-  if (ff->varslen == ff->varscap && !(ff->varslen&31)) {
+  if (ff->varslen == ff->varscap) {
     ff->varscap += 32;
     ff->vars = xrealloc(ff->vars, (ff->varscap)*sizeof(*ff->vars));
   }
@@ -847,8 +847,8 @@ static int anystr(char *s, char **try)
 // Update $IFS cache in function call stack after variable assignment
 static void cache_ifs(char *s, struct sh_fcall *ff)
 {
-  if (!strncmp(s, "IFS=", 4))
-    do ff->ifs = s+4; while ((ff = ff->next) != TT.ff->prev);
+  if (strstart(&s, "IFS="))
+    do ff->ifs = s; while ((ff = ff->next) != TT.ff->prev);
 }
 
 // declare -aAilnrux
@@ -951,7 +951,7 @@ bad:
 }
 
 // Creates new variables (local or global) and handles +=
-// returns 0 on error, else sh_vars of new entry.
+// returns 0 on error, else sh_vars of new entry. Adds at ff if not found.
 static struct sh_vars *setvar_long(char *s, int freeable, struct sh_fcall *ff)
 {
   struct sh_vars *vv = 0, *was;
@@ -982,7 +982,7 @@ static struct sh_vars *setvar_long(char *s, int freeable, struct sh_fcall *ff)
 // Returns sh_vars * or 0 for failure (readonly, etc)
 static struct sh_vars *setvar(char *str)
 {
-  return setvar_long(str, 0, TT.ff->prev);
+  return setvar_long(str, 1, TT.ff->prev);
 }
 
 
@@ -1004,7 +1004,7 @@ static int unsetvar(char *name)
     // free from global context
     } else {
       if (!(var->flags&VAR_NOFREE)) free(var->str);
-      memmove(var, var+1, sizeof(ff->vars)*(ff->varslen-(var-ff->vars)));
+      memmove(var, var+1, sizeof(ff->vars)*(ff->varslen-- -(var-ff->vars)));
     }
     if (!strcmp(name, "IFS"))
       do ff->ifs = " \t\n"; while ((ff = ff->next) != TT.ff->prev);
-- 
2.39.5