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 e33a2e1688946dd3c8ea912c95531775bfffee62..007246c58b9cc2042c2c9b464a42bbf056ccf22d 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 *
@@
-24,14
+24,9
@@
#include "config.h"
#endif
#include "config.h"
#endif
-#include "types.h"
-#include "command.h"
#include "configuration.h"
#include "log.h"
#include "configuration.h"
#include "log.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
static size_t num_config_files;
static char** config_file_names;
static size_t num_config_files;
static char** config_file_names;
@@
-42,16
+37,18
@@
static char** script_search_dirs;
void add_script_search_dir (const char *dir)
{
num_script_dirs++;
void add_script_search_dir (const char *dir)
{
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)
{
num_config_files++;
}
void add_config_command (const char *cfg)
{
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;
@@
-64,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);
}
@@
-86,20
+85,23
@@
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')
{
return fopen(file, mode);
} else
{
{
if (mode[0]!='r')
{
return fopen(file, mode);
} else
{
- char *full_path
=
find_file(file);
- if (full_path
==
NULL)
+ char *full_path
=
find_file(file);
+ if (full_path
==
NULL)
return NULL;
FILE *fp = NULL;
fp = fopen(full_path, mode);
return NULL;
FILE *fp = NULL;
fp = fopen(full_path, mode);
@@
-108,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;
@@
-120,8
+122,8
@@
int parse_config_file(struct command_context_s *cmd_ctx)
while (*cfg)
{
while (*cfg)
{
- retval
=
command_run_line(cmd_ctx, *cfg);
- if (retval
!=
ERROR_OK)
+ retval
=
command_run_line(cmd_ctx, *cfg);
+ if (retval
!=
ERROR_OK)
return retval;
cfg++;
}
return retval;
cfg++;
}