Changeset 31667 for trunk/Ohana/src/opihi/lib.shell/CommandOps.c

Timestamp:

Jun 22, 2011, 12:40:23 AM (15 years ago)

Author:

eugene

Message:

merge from trunk: various details, see eam/ipp-20110505

File:

• trunk/Ohana/src/opihi/lib.shell/CommandOps.c (modified) (2 diffs)

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

@@ -106 +106 @@
 }  
 
+/* we need a strcreate function that does NOT use the ohana memory management
+ * system to interact with some external libraries (which themselves free the memory)
+ */
+char *strcreate_sans_ohana (char *string) {
+
+  char *line;
+
+  if (string == (char *) NULL) return ((char *) NULL);
+  
+  line = malloc (MAX (1, strlen(string)) + 1);
+  line = strcpy (line, string);
+
+  return (line);
+}
+
 /* generate a command completion list for readline */
 /**** these probably do not interact well with OHANA memory!!! ****/
@@ -122 +137 @@
   for (i++; i < Ncommands; i++) {
     if (!len) 
-      return (strcreate(commands[i].name));
+
+
+      return (strcreate_sans_ohana(commands[i].name));
     if (!strncmp (commands[i].name, text, len)) {
-      return (strcreate(commands[i].name));
+      return (strcreate_sans_ohana(commands[i].name));
     }
   }