Changeset 7929 for trunk/Ohana/src/opihi/lib.shell/command_client.c

Timestamp:

Jul 18, 2006, 6:58:54 AM (20 years ago)

Author:

eugene

Message:

updates to fix comm problems with buffers (motivated by opihi gprint)

File:

• trunk/Ohana/src/opihi/lib.shell/command_client.c (modified) (4 diffs)

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

@@ -2 +2 @@
 # define VERBOSE 0
 
-/* this function acts like the standard command parser,
-   but skips the expansion of variables and vectors */
+// this function is identical to the normal command.c function,
+// but it returns -1 for a missing command and does not echo the
+// 'missing command' error message
+
 int command_client (char *line, char **outline) {
 
@@ -17 +19 @@
   }
 
+  /* expand anything of the form $fred or $fred$sam, etc */ 
+  line = expand_vars (line);     /* line is freed here, new one allocated */
+  /* expand anything of the form fred[N] */ 
+  line = expand_vectors (line);  /* line is freed here, new one allocated */
+  /* solve math expresions, assign variable, if needed */
+  line = parse (line);        /* line is freed here, new one allocated */
+  /* any entry in line of the form {foo} returns value or tmp vector / buffer */
+
   /* we may have reallocated line, return new pointer */
   *outline = line;
@@ -27 +37 @@
   for (i = 0; i < argc; i++) targv[i] = argv[i];
 
-  cmd = MatchCommand (argv[0], TRUE, FALSE);
+  // use non-verbose mode to skip 'missing command' error message
+  cmd = MatchCommand (argv[0], FALSE, FALSE);
   if (cmd == NULL) {
-    status = FALSE;
+    status = -1;
   } else {
     free (argv[0]);
@@ -40 +51 @@
   free (argv);
 
+  if (!status) {
+    char *msg;
+    msg = get_variable_ptr ("ERRORMSG");
+    if (msg != (char *) NULL) gprint (GP_ERR, "%s\n", msg);
+  }
+
+  set_int_variable ("STATUS", status);
+  if (VERBOSE) gprint (GP_ERR, "command: %s, status: %d\n", line, status);
   return (status);
 }