Changeset 0262f180 in mainline

Timestamp:

2013-01-27T16:48:26Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c84f1a4

Parents:

7699c21

Message:

Extend batch' command with -c'

Allow to execute all commands despite errors in some of them.

File:

• uspace/app/bdsh/cmds/builtins/batch/batch.c (modified) (6 diffs)

uspace/app/bdsh/cmds/builtins/batch/batch.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <errno.h>
 #include "config.h"
 #include "util.h"
@@ -44 +46 @@
         if (level == HELP_SHORT) {
                 printf(
-                "\n  batch [filename]\n"
+                "\n  batch [filename] [-c]\n"
                 "  Issues commands stored in the file.\n"
                 "  Each command must correspond to the single line in the file.\n\n");
@@ -54 +56 @@
                 "  separate groups of commands. There is no support for comments,\n"
                 "  variables, recursion or other programming constructs - the `batch'\n"
-                "  command is indeed very trivial.\n\n");
+                "  command is indeed very trivial.\n"
+                "  If the filename is followed by -c, execution continues even if some\n"
+                "  of the commands failed.\n\n");
         }
 
@@ -65 +69 @@
 {
         unsigned int argc;
+        bool continue_despite_errors = false;
 
         /* Count the arguments */
@@ -72 +77 @@
                 printf("%s - no input file provided.\n", cmdname);
                 return CMD_FAILURE;
+        }
+
+        if (argc > 2) {
+                if (str_cmp(argv[2], "-c") == 0)
+                        continue_despite_errors = true;
         }
 
@@ -99 +109 @@
                                         rc = process_input(&fusr);
                                         /* fusr->line was freed by process_input() */
+                                        if ((rc != EOK) && continue_despite_errors) {
+                                                /* Mute the error. */
+                                                rc = EOK;
+                                        }
                                 }
                                 if (rc == 0 && c != EOF) {