Changeset 42808

Timestamp:

May 8, 2025, 11:37:15 AM (14 months ago)

Author:

eugene

Message:

fix an obscure mem-corruption issue; enable "macro create" and other macro sub-commands in lists (if,while,macro)

Location:

trunk/Ohana/src/opihi/lib.shell

Files:

• CommandOps.c (modified) (1 diff)
• ListOps.c (modified) (2 diffs)
• MacroOps.c (modified) (1 diff)
• macro_create.c (modified) (1 diff)

trunk/Ohana/src/opihi/lib.shell/CommandOps.c

@@ -59 +59 @@
 
   free (commands[Nc].name);
-  for (i = Nc + 1; i < Ncommands; i++)
+  for (i = Nc + 1; i < Ncommands; i++) {
     commands[i - 1] = commands[i];
+  }
   Ncommands --;
-  REALLOCATE (commands, Command, Ncommands);
   return (TRUE);
 }

trunk/Ohana/src/opihi/lib.shell/ListOps.c

@@ -133 +133 @@
 }
 
+// this should return TRUE (is start of a new list-type environment)
+// if the word following 'macro' is not one of the following:
+// 'list', 'delete', 'read', 'write', 'edit'
 int is_macro_create (char *line) {
 
@@ -150 +153 @@
   if (this_macro == NULL) return (FALSE);
 
+  // the other macro subcommands do NOT start a new list environment
+  if (!strcmp("create", this_macro)) {
+    free (this_macro);
+    return (TRUE);
+  }
+
   cmd = find_macro_command (this_macro);
   free (this_macro);
 
-  if (cmd == NULL) {
-    return (FALSE);
-  }
-
-  return (TRUE);
+  if (cmd == NULL) return (TRUE);
+
+  return (FALSE);
 }
 

trunk/Ohana/src/opihi/lib.shell/MacroOps.c

@@ -111 +111 @@
 
   FreeMacro (&macros[Nm]);
-  for (i = Nm + 1; i < Nmacros; i++)
+  for (i = Nm + 1; i < Nmacros; i++) {
     macros[i - 1] = macros[i];
+  }
   Nmacros --;
   return (TRUE);

trunk/Ohana/src/opihi/lib.shell/macro_create.c

@@ -45 +45 @@
     cmd[0].func = macro_exec;
     AddCommand (cmd);
-    free (cmd);
+    free (cmd); // 
     macro = NewMacro (argv[1]);
   } else { /**** Old Macro ****/