X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fconfiguration.c;h=007246c58b9cc2042c2c9b464a42bbf056ccf22d;hb=c538a830cdaafa92c9e9a624d84915cc39cce05b;hp=1f7240d9eb4ae5c49b67053e18d1b0c82b79f158;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;p=openocd.git diff --git a/src/helper/configuration.c b/src/helper/configuration.c index 1f7240d9eb..007246c58b 100644 --- a/src/helper/configuration.c +++ b/src/helper/configuration.c @@ -41,6 +41,8 @@ void add_script_search_dir (const char *dir) script_search_dirs[num_script_dirs-1] = strdup(dir); script_search_dirs[num_script_dirs] = NULL; + + LOG_DEBUG("adding %s", dir); } void add_config_command (const char *cfg) @@ -59,21 +61,23 @@ char *find_file(const char *file) char **search_dirs = script_search_dirs; char *dir; char const *mode="r"; - char full_path[1024]; + char *full_path; /* Check absolute and relative to current working dir first. * This keeps full_path reporting belowing working. */ - snprintf(full_path, 1024, "%s", file); + full_path = alloc_printf("%s", file); fp = fopen(full_path, mode); while (!fp) { + free(full_path); + full_path = NULL; dir = *search_dirs++; if (!dir) break; - snprintf(full_path, 1024, "%s/%s", dir, file); + full_path = alloc_printf("%s/%s", dir, file); fp = fopen(full_path, mode); } @@ -81,12 +85,15 @@ char *find_file(const char *file) { fclose(fp); LOG_DEBUG("found %s", full_path); - return strdup(full_path); + return full_path; } + + free(full_path); + return NULL; } -FILE *open_file_from_path (char *file, char *mode) +FILE *open_file_from_path(const char *file, const char *mode) { if (mode[0]!='r') {