* 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 *
#include "config.h"
#endif
-#include "types.h"
-#include "command.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;
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;
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;
snprintf(full_path, 1024, "%s/%s", dir, file);
fp = fopen(full_path, mode);
}
-
+
if (fp)
{
fclose(fp);
return NULL;
}
-
FILE *open_file_from_path (char *file, char *mode)
{
if (mode[0]!='r')
return fopen(file, mode);
} else
{
- char *full_path=find_file(file);
+ char *full_path = find_file(file);
+ if (full_path == NULL)
+ return NULL;
FILE *fp = NULL;
fp = fopen(full_path, mode);
free(full_path);
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++;
}