jim license cleanup

[openocd.git] / src / helper / configuration.c

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index ff8b0272e98137e2fab21a249898453115f91b46..6c2bf474c93ea13b9f9e7ac4441e86c1183675f9 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -55,7 +55,7 @@ void add_config_command (const char *cfg)
 }
 
 /* return full path or NULL according to search rules */
-char *find_file(char *file)
+char *find_file(const char *file)
 {
        FILE *fp = NULL;
        char **search_dirs = script_search_dirs;
@@ -106,6 +106,7 @@ FILE *open_file_from_path (char *file, char *mode)
 
 int parse_config_file(struct command_context_s *cmd_ctx)
 {
+       int retval;
        char **cfg;
 
        if (!config_file_names)
@@ -115,7 +116,9 @@ int parse_config_file(struct command_context_s *cmd_ctx)
 
        while (*cfg)
        {
-               command_run_line(cmd_ctx, *cfg);
+               retval=command_run_line(cmd_ctx, *cfg);
+               if (retval!=ERROR_OK)
+                       return retval;
                cfg++;
        }