Changeset 30115 for branches/eam_branches/ipp-20101205/Ohana/src/opihi/lib.shell/command.c

Timestamp:

Dec 20, 2010, 8:36:52 AM (16 years ago)

Author:

eugene

Message:

handle syntax errors in ohana scripts as errors

File:

• branches/eam_branches/ipp-20101205/Ohana/src/opihi/lib.shell/command.c (modified) (5 diffs)

branches/eam_branches/ipp-20101205/Ohana/src/opihi/lib.shell/command.c

@@ -10 +10 @@
   Command *cmd;
 
-  // rawline = NULL;
+  // the input line is never NULL
+  if (!line) { fprintf (stderr, "programming error\n"); abort(); }
+
   rawline = strcreate (line);
 
@@ -20 +22 @@
   }
 
- XXX: check for NULL return from expand_* and raise error
-
   /* expand anything of the form $fred or $fred$sam, etc */ 
   line = expand_vars (line);     /* line is freed here, new one allocated */
+  if (!line) goto escape;
+
   /* expand anything of the form fred[N] */ 
   line = expand_vectors (line);  /* line is freed here, new one allocated */
+  if (!line) goto escape;
 
   // print the line with the variables and vectors expanded, but before evaluating 
@@ -31 +34 @@
   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 */
-  /* any entry in line of the form {foo} returns value or tmp vector / buffer */
+  /* solve math expresions, assign variable, if needed.  any entry in line of the form {foo}
+   * returns value or tmp vector / buffer */
+  line = parse (&status, line);        /* line is freed here, new one allocated */
+  if (!status) goto escape;
 
   /* we may have reallocated line, return new pointer */
@@ -41 +45 @@
   if (argc == 0) {
       FREE (rawline);
+      set_int_variable ("STATUS", TRUE);
       return (TRUE);  /* empty command or assignment */
   }
@@ -76 +81 @@
   FREE (rawline);
   return (status);
+
+ escape:
+  set_int_variable ("STATUS", FALSE);
+
+  # if (DEBUG) 
+  gprint (GP_ERR, "command: %s, status: %d\n", line, FALSE);
+  # endif
+
+  FREE (rawline);
+  return FALSE;
 }