projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore -dev suffix, archive NEWS file, add new blank NEWS file - start
[fw/openocd]
/
src
/
helper
/
configuration.c
diff --git
a/src/helper/configuration.c
b/src/helper/configuration.c
index 95b4c7e0ce3edaef4c2c5dae80fd635ac51e4541..49c1c08f73038647f021ab1f3418485745496562 100644
(file)
--- a/
src/helper/configuration.c
+++ b/
src/helper/configuration.c
@@
-2,7
+2,7
@@
* Copyright (C) 2004, 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
* Copyright (C) 2004, 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008
Ø
yvind Harboe *
+ * Copyright (C) 2007,2008
Ø
yvind Harboe *
* oyvind.harboe@zylin.com *
* *
* This program is free software; you can redistribute it and/or modify *
* oyvind.harboe@zylin.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-27,26
+27,29
@@
#include "configuration.h"
#include "log.h"
#include "configuration.h"
#include "log.h"
-
static size_t num_config_files;
static size_t num_config_files;
-static char
**
config_file_names;
+static char
**
config_file_names;
static size_t num_script_dirs;
static size_t num_script_dirs;
-static char
**
script_search_dirs;
+static char
**
script_search_dirs;
-void add_script_search_dir
(const char *dir)
+void add_script_search_dir(const char *dir)
{
num_script_dirs++;
{
num_script_dirs++;
- script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *));
+ script_search_dirs =
+ (char **)realloc(script_search_dirs, (num_script_dirs + 1) * sizeof(char *));
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)
{
num_config_files++;
{
num_config_files++;
- config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
+ 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;
config_file_names[num_config_files-1] = strdup(cfg);
config_file_names[num_config_files] = NULL;
@@
-58,42
+61,43
@@
char *find_file(const char *file)
FILE *fp = NULL;
char **search_dirs = script_search_dirs;
char *dir;
FILE *fp = NULL;
char **search_dirs = script_search_dirs;
char *dir;
- char const *mode
=
"r";
- char
full_path[1024]
;
+ char const *mode
=
"r";
+ 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);
fp = fopen(full_path, mode);
- while (!fp)
- {
+ 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);
}
- if (fp)
- {
+ if (fp) {
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')
return fopen(file, mode);
return fopen(file, mode);
- } else
- {
- char *full_path=find_file(file);
+ else {
+ char *full_path = find_file(file);
if (full_path == NULL)
return NULL;
FILE *fp = NULL;
if (full_path == NULL)
return NULL;
FILE *fp = NULL;
@@
-103,19
+107,20
@@
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;
- 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;
cfg = config_file_names;
- while (*cfg)
- {
- retval=command_run_line(cmd_ctx, *cfg);
+ while (*cfg) {
+ retval = command_run_line(cmd_ctx, *cfg);
if (retval != ERROR_OK)
return retval;
cfg++;
if (retval != ERROR_OK)
return retval;
cfg++;