Changeset 41388

Timestamp:

Jul 7, 2020, 9:33:22 AM (6 years ago)

Author:

eugene

Message:

correctly handle if,else where logic is not 0 or 1; catch repeated else-blocks

File:

• trunk/Ohana/src/opihi/cmd.basic/run_if.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.basic/run_if.c

@@ -5 +5 @@
 
   int ThisList, depth, done, status, InlineCommand;
-  int i, length, logic;
+  int i, length, logic, foundElse;
   char *input, *val, *line;
   int nloop, size;
@@ -60 +60 @@
   ThisList = current_list_depth();
 
+  foundElse = FALSE;
   done = FALSE;
   while (!done) {
@@ -91 +92 @@
     /* check for an "else", invert logic */
     if ((depth == 0) && !strncasecmp (input, "ELSE", 4)) {
-      logic ^= TRUE;
+      logic = !logic;
       free (input);
+
+      if (foundElse) {
+        gprint (GP_ERR, "multiple 'ELSE' statements in if-block with 'END'\n");
+        return FALSE;
+      }
+      foundElse = TRUE;
       continue;
     }