Changeset 10846 for trunk/Ohana/src/opihi/cmd.basic/run_if.c

Timestamp:

Dec 27, 2006, 10:43:47 AM (20 years ago)

Author:

eugene

Message:

added last, next, return, fixed continue

File:

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

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

@@ -4 +4 @@
 int run_if (int argc, char **argv) {
 
-  int ThisList, depth, done, status, BreakOnTrue;
-  int logic;
-  char *input, *val;
+  int ThisList, depth, done, status, InlineCommand;
+  int i, length, logic;
+  char *input, *val, *line;
   int nloop, size;
 
-  BreakOnTrue = FALSE;
+  InlineCommand = FALSE;
 
-  if ((argc != 2) && (argc != 3)) {
-    gprint (GP_ERR, "USAGE: if (conditional) [break], end with the word 'END'\n");
+  if (argc < 2) {
+    gprint (GP_ERR, "USAGE: if (conditional) : follow with commands, end with the word 'END'\n");
+    gprint (GP_ERR, "   OR: if (conditional) command\n");
     return (FALSE);
   }
-  if ((argc == 3) && strcmp (argv[2], "break")) {
-    gprint (GP_ERR, "USAGE: if (conditional) [break], end with the word 'END'\n");
-    return (FALSE);
+  if (argc > 2) {
+    InlineCommand = TRUE;
   }
-  if ((argc == 3) && !strcmp (argv[2], "break")) {
-    BreakOnTrue = TRUE;
-  }
-
-  /* read in if-list */
-  nloop = 0;
-  depth = 0;
-  ThisList = current_list_depth();
 
   /* determine value of conditional expression */
@@ -34 +26 @@
     return (FALSE);
   }
-  logic = atof (val); /* warning: round-off error is a danger */ 
+  logic = atof (val); /* is round-off error a danger? */ 
   free (val);
 
-  if (BreakOnTrue) {
+  if (InlineCommand) {
     if (logic) {
-      loop_break = TRUE;
-      return (FALSE);
+      /* re-build a command line from the remaining strings */
+      length = 0;
+      for (i = 2; i < argc; i++) {
+        length += strlen(argv[i]) + 1;
+      }
+      length++;
+      ALLOCATE (line, char, length);
+      memset (line, 0, length);
+      for (i = 2; i < argc; i++) {
+        if (i == 2) {
+          strcpy (line, argv[i]);
+        } else {
+          strcat (line, " ");
+          strcat (line, argv[i]);
+        }
+      }
+      status = multicommand (line);
+      free (line);
+      return (status);
     } else {
       return (TRUE);
     }
   }    
+
+  /* read in if-list */
+  nloop = 0;
+  depth = 0;
+  ThisList = current_list_depth();
 
   done = FALSE;