Changeset 28003 for branches/pap/Ohana/src/opihi/lib.shell/command.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

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

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

@@ -2 +2 @@
 # define DEBUG 0
 
-static int VERBOSE_SHELL = FALSE;
+static int VERBOSE_SHELL = OPIHI_VERBOSE_OFF;
 
 int command (char *line, char **outline, int VERBOSE) {
@@ -10 +10 @@
   Command *cmd;
 
-  rawline = NULL;
-  // rawline = strcreate (line);
+  // rawline = NULL;
+  rawline = strcreate (line);
 
   /* force a space between ! and first word: !ls becomes ! ls */
@@ -24 +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 */
@@ -31 +36 @@
   *outline = line;
   
-  if (VERBOSE_SHELL) gprint (GP_ERR, "opihi: %s\n", line);
-
   argv = parse_commands (line, &argc);
   if (argc == 0) {
@@ -60 +63 @@
     msg = get_variable_ptr ("ERRORMSG");
     if (msg != (char *) NULL) gprint (GP_ERR, "%s\n", msg);
-    if (VERBOSE_SHELL) gprint (GP_ERR, "error on line: %s\n", rawline);
+    if (VERBOSE_SHELL != OPIHI_VERBOSE_OFF) gprint (GP_ERR, "error on line: %s\n", rawline);
   }