projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
at91rm9200: use register_commands()
[fw/openocd]
/
src
/
helper
/
configuration.c
diff --git
a/src/helper/configuration.c
b/src/helper/configuration.c
index 3c44d6d470077703ae93efe5224c49d4cef15d0d..007246c58b9cc2042c2c9b464a42bbf056ccf22d 100644
(file)
--- 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;
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)
}
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 **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. */
/* 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)
{
fp = fopen(full_path, mode);
while (!fp)
{
+ free(full_path);
+ full_path = NULL;
dir = *search_dirs++;
if (!dir)
break;
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);
}
fp = fopen(full_path, mode);
}
@@
-81,12
+85,15
@@
char *find_file(const char *file)
{
fclose(fp);
LOG_DEBUG("found %s", full_path);
{
fclose(fp);
LOG_DEBUG("found %s", full_path);
- return
strdup(full_path)
;
+ return
full_path
;
}
}
+
+ free(full_path);
+
return NULL;
}
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')
{
{
if (mode[0]!='r')
{
@@
-103,7
+110,7
@@
FILE *open_file_from_path (char *file, char *mode)
}
}
}
}
-int parse_config_file(struct command_context
_s
*cmd_ctx)
+int parse_config_file(struct command_context *cmd_ctx)
{
int retval;
char **cfg;
{
int retval;
char **cfg;