Commit 71471b07 authored by oharboe's avatar oharboe
Browse files

added support for Tcl config scripts on the command line(use .tcl extension).

git-svn-id: svn://svn.berlios.de/openocd/trunk@743 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent 269c6d83
......@@ -45,7 +45,7 @@ void add_script_search_dir (const char *dir)
script_search_dirs[num_script_dirs] = NULL;
}
void add_config_file_name (const char *cfg)
void add_config_command (const char *cfg)
{
num_config_files++;
config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
......@@ -109,7 +109,7 @@ int parse_config_file(struct command_context_s *cmd_ctx)
char **cfg;
if (!config_file_names)
add_config_file_name ("script openocd.cfg");
add_config_command ("script openocd.cfg");
cfg = config_file_names;
......
......@@ -25,7 +25,7 @@
extern int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]);
extern int parse_config_file(struct command_context_s *cmd_ctx);
extern void add_config_file_name (const char *cfg);
extern void add_config_command (const char *cfg);
extern void add_script_search_dir (const char *dir);
extern int configuration_output_handler(struct command_context_s *context, char* line);
extern FILE *open_file_from_path (char *file, char *mode);
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment