X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fconfiguration.c;h=eedd8a1ca823841305069bcbc83a92c900d536c2;hb=3931b99d142d337ea6558fd09aad2e0812c04507;hp=74bcc9b0af949d0fbc745f95f22032a8ec5ac7c7;hpb=0a9daddc2e20d9ff5053a9faf3e1ec11fd600c73;p=openocd.git

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 74bcc9b0af..eedd8a1ca8 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,8 +85,11 @@ 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;
 }
 
@@ -108,8 +115,10 @@ int parse_config_file(struct command_context *cmd_ctx)
 	int retval;
 	char **cfg;
 
-	if (!config_file_names)
-		add_config_command ("script openocd.cfg");
+	if (!config_file_names) {
+		command_run_line(cmd_ctx, "script openocd.cfg");
+		return ERROR_OK;
+	}
 
 	cfg = config_file_names;