src/helper/configuration.h

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

diff --git a/src/helper/options.c b/src/helper/options.c
index 23b0a63707b149dc058d805919a57b121701d3ce..afff55ba4964a75e03c5fd943160e6a24b12a13c 100644 (file)
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -45,9 +45,9 @@ static struct option long_options[] =
        {0, 0, 0, 0}
 };
 
-int configuration_output_handler(struct command_context_s *context, char* line)
+int configuration_output_handler(struct command_context_s *context, const char* line)
 {
-       INFO_N(line);
+       LOG_INFO_N(line);
 
        return ERROR_OK;
 }
@@ -79,9 +79,19 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
                                version_flag = 1;
                                break;
                        case 'f':       /* --file | -f */
-                               snprintf(command_buffer, 128, "script %s", optarg);
-                               add_config_file_name(command_buffer);
+                       {
+                               char *t=strrchr(optarg, '.');
+                               if (strcmp(t, ".tcl")==0)
+                               {
+                                       /* Files ending in .tcl are executed as Tcl files */
+                                       snprintf(command_buffer, 128, "source [find {%s}]", optarg);
+                               } else
+                               {
+                                       snprintf(command_buffer, 128, "script %s", optarg);
+                               }
+                               add_config_command(command_buffer);
                                break;
+                       }
                        case 's':       /* --search | -s */
                                add_script_search_dir(optarg);
                                break;
@@ -102,7 +112,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
                        case 'c':       /* --command | -c */
                                if (optarg)
                                {
-                                       add_config_file_name(optarg);
+                                       add_config_command(optarg);
                                }       
                                break;
                                
@@ -111,14 +121,14 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 
        if (help_flag)
        {
-               OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
-               OUTPUT("--help       | -h\tdisplay this help\n");
-               OUTPUT("--version    | -v\tdisplay OpenOCD version\n");
-               OUTPUT("--file       | -f\tuse configuration file <name>\n");
-               OUTPUT("--search     | -s\tdir to search for config files and scripts\n");
-               OUTPUT("--debug      | -d\tset debug level <0-3>\n");
-               OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
-               OUTPUT("--command    | -c\trun <command>\n");
+               LOG_OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
+               LOG_OUTPUT("--help       | -h\tdisplay this help\n");
+               LOG_OUTPUT("--version    | -v\tdisplay OpenOCD version\n");
+               LOG_OUTPUT("--file       | -f\tuse configuration file <name>\n");
+               LOG_OUTPUT("--search     | -s\tdir to search for config files and scripts\n");
+               LOG_OUTPUT("--debug      | -d\tset debug level <0-3>\n");
+               LOG_OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
+               LOG_OUTPUT("--command    | -c\trun <command>\n");
                exit(-1);
        }