Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/lib.shell/command.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/lib.shell/command.c (modified) (5 diffs)

branches/simtest_nebulous_branches/Ohana/src/opihi/lib.shell/command.c

@@ -1 +1 @@
 # include "opihi.h"
 # define DEBUG 0
+
+static int VERBOSE_SHELL = OPIHI_VERBOSE_OFF;
 
 int command (char *line, char **outline, int VERBOSE) {
 
   int i, status, argc;
-  char **argv, **targv;
+  char **argv, **targv, *rawline;
   Command *cmd;
+
+  // rawline = NULL;
+  rawline = strcreate (line);
 
   /* force a space between ! and first word: !ls becomes ! ls */
@@ -19 +24 @@
   /* expand anything of the form fred[N] */ 
   line = expand_vectors (line);  /* line is freed here, new one allocated */
+
+  // print the line with the variables and vectors expanded, but before evaluating 
+  // any in-line math expression
+  if (VERBOSE_SHELL == OPIHI_VERBOSE_ON) gprint (GP_ERR, "opihi: %s\n", line);
+
   /* solve math expresions, assign variable, if needed */
   line = parse (line);        /* line is freed here, new one allocated */
@@ -26 +36 @@
   *outline = line;
   
-  # if (DEBUG) 
-  fprintf (stderr, "line: %s\n", line);
-  # endif
-
   argv = parse_commands (line, &argc);
-  if (argc == 0) return (TRUE);  /* empty command or assignment */
+  if (argc == 0) {
+      FREE (rawline);
+      return (TRUE);  /* empty command or assignment */
+  }
 
   /* save the original values of argv since command may modify the array */
@@ -54 +63 @@
     msg = get_variable_ptr ("ERRORMSG");
     if (msg != (char *) NULL) gprint (GP_ERR, "%s\n", msg);
+    if (VERBOSE_SHELL != OPIHI_VERBOSE_OFF) gprint (GP_ERR, "error on line: %s\n", rawline);
   }
 
@@ -62 +72 @@
   # endif
 
+  FREE (rawline);
   return (status);
 }
+
+void set_verbose_shell(int mode) {
+    VERBOSE_SHELL = mode;
+}
+
+int get_verbose_shell(void) {
+    return VERBOSE_SHELL;
+}
+
+    
 
 /* parse the input line, search for the corresponding command, and execute it