- clean up target output strings a bit

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

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index d48977c51288f4a8bf8c84713757552dd0f770c1..d72556060bb738935299539481d6b2b67b27276f 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -28,104 +28,82 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <getopt.h>
+#include <string.h>
 
-char* config_file_name;
+static size_t num_config_files;
+static char** config_file_names;
 
-static int help_flag;
+static size_t num_script_dirs;
+static char** script_search_dirs;
 
-static struct option long_options[] =
+void add_script_search_dir (const char *dir)
 {
-       {"help",                        no_argument,    &help_flag, 1},
+       num_script_dirs++;
+       script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *));
 
-       {"debug",                       optional_argument,      0, 'd'},
-       {"file",                        required_argument,      0, 'f'},
-       {"log_output",          required_argument,      0, 'l'},
-       
-       {0, 0, 0, 0}
-};
+       script_search_dirs[num_script_dirs-1] = strdup(dir);
+       script_search_dirs[num_script_dirs] = NULL;
+}
 
-int configuration_output_handler(struct command_context_s *context, char* line)
+void add_config_file_name (const char *cfg)
 {
-       INFO(line);
-       
-       return ERROR_OK;
+       num_config_files++;
+       config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
+
+       config_file_names[num_config_files-1] = strdup(cfg);
+       config_file_names[num_config_files] = NULL;
 }
 
-int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
+FILE *open_file_from_path (char *file, char *mode)
 {
-       int c;
-       char command_buffer[128];
-                       
-       while (1)
-       {       
-               /* getopt_long stores the option index here. */
-               int option_index = 0;
-               
-               c = getopt_long(argc, argv, "hd::l:f:", long_options, &option_index);
+       if (mode[0]!='r')
+       {
+               return fopen(file, mode);
+       } else
+       {
                
-               /* Detect the end of the options. */
-               if (c == -1)
+       FILE *fp = NULL;
+       char **search_dirs = script_search_dirs;
+       char *dir;
+       char full_path[1024];
+
+       /* Check absolute and relative to current working dir first.
+        * This keeps full_path reporting belowing working. */
+       snprintf(full_path, 1024, "%s", file);
+       fp = fopen(full_path, mode);
+
+       while (!fp)
+       {
+               dir = *search_dirs++;
+
+               if (!dir)
                        break;
-               
-               switch (c)
-               {
-                       case 0:
-                               break;
-                       case 'h':       /* --help | -h */
-                               help_flag = 1;
-                               break;
-                       case 'f':       /* --file | -f */
-                               config_file_name = optarg;
-                               break;
-                       case 'd':       /* --debug | -d */
-                               if (optarg)
-                                       snprintf(command_buffer, 128, "debug_level %s", optarg);
-                               else
-                                       snprintf(command_buffer, 128, "debug_level 3");
-                               command_run_line(cmd_ctx, command_buffer);
-                               break;
-                       case 'l':       /* --log_output | -l */
-                               if (optarg)
-                               {
-                                       snprintf(command_buffer, 128, "log_output %s", optarg);
-                                       command_run_line(cmd_ctx, command_buffer);
-                               }       
-                               break;
-               }
+
+               snprintf(full_path, 1024, "%s/%s", dir, file);
+               fp = fopen(full_path, mode);
        }
 
-       if (help_flag)
-       {
-               printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n");
-               printf("--help       | -h\tdisplay this help\n");
-               printf("--file       | -f\tuse configuration file <name>\n");
-               printf("--debug      | -d\tset debug level <0-3>\n");
-               printf("--log_output | -l\tredirect log output to file <name>\n");
-               exit(-1);
-       }       
+       if (fp)
+                       DEBUG("opened %s", full_path);
 
-       return ERROR_OK;
+       return fp;
+       }
 }
 
 int parse_config_file(struct command_context_s *cmd_ctx)
 {
-       FILE *config_file;
+       char **cfg;
 
-       if (!config_file_name)
-               config_file_name = "openocd.cfg";
+       if (!config_file_names)
+               add_config_file_name ("script openocd.cfg");
 
-       config_file = fopen(config_file_name, "r");
-       if (!config_file)
+       cfg = config_file_names;
+
+       while (*cfg)
        {
-               ERROR("couldn't open config file");
-               return ERROR_NO_CONFIG_FILE;
+               command_run_line(cmd_ctx, *cfg);
+               cfg++;
        }
 
-       command_run_file(cmd_ctx, config_file, COMMAND_CONFIG);
-
-       fclose(config_file);
-
        return ERROR_OK;
 }
-