Changeset 11007 for trunk/Ohana/src/opihi/lib.shell/ListOps.c

Timestamp:

Jan 10, 2007, 7:43:40 AM (20 years ago)

Author:

eugene

Message:

fixed macro function error, added restrictions to book selections

File:

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

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

@@ -111 +111 @@
   char *comm;
   char *this_macro;
-
-  comm = thisword (line);
-  if (comm == (char *) NULL) return (FALSE);
+  CommandF *cmd;
+
+  comm = thisword (line);
+  if (comm == NULL) return (FALSE);
 
   status = !strcmp (comm, "macro");
@@ -120 +121 @@
   
   this_macro = thisword (nextword (line));
-
-  if (this_macro == (char *)NULL) return (FALSE);
-
-  N = sizeof (in_macro) / sizeof (Command);
-
-  /* find the macro sub-command which matches from the list. */
-  /* if sub-command is not found, assume this is creating a new macro */
-  for (i = 0; i < N; i++) {
-    if (!strcmp (in_macro[i].name, this_macro)) {
-      free (this_macro);
-      return (FALSE);
-    }
-  }
-
+  if (this_macro == NULL) return (FALSE);
+
+  cmd = find_macro_command (this_macro);
   free (this_macro);
+
+  if (cmd == NULL) {
+    return (FALSE);
+  }
+
   return (TRUE);
-
 }