summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/configuration.c34
-rw-r--r--src/helper/configuration.h1
2 files changed, 25 insertions, 10 deletions
diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 2d84d9e6..68c863f3 100644
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -54,17 +54,13 @@ void add_config_file_name (const char *cfg)
config_file_names[num_config_files] = NULL;
}
-FILE *open_file_from_path (char *file, char *mode)
+/* return full path or NULL according to search rules */
+char *find_file(char *file)
{
- if (mode[0]!='r')
- {
- return fopen(file, mode);
- } else
- {
-
FILE *fp = NULL;
char **search_dirs = script_search_dirs;
char *dir;
+ char const *mode="r";
char full_path[1024];
/* Check absolute and relative to current working dir first.
@@ -82,11 +78,29 @@ FILE *open_file_from_path (char *file, char *mode)
snprintf(full_path, 1024, "%s/%s", dir, file);
fp = fopen(full_path, mode);
}
-
+
if (fp)
- LOG_DEBUG("opened %s", full_path);
+ {
+ fclose(fp);
+ LOG_DEBUG("found %s", full_path);
+ return strdup(full_path);
+ }
+ return NULL;
+}
- return fp;
+
+FILE *open_file_from_path (char *file, char *mode)
+{
+ if (mode[0]!='r')
+ {
+ return fopen(file, mode);
+ } else
+ {
+ char *full_path=find_file(file);
+ FILE *fp = NULL;
+ fp = fopen(full_path, mode);
+ free(full_path);
+ return fp;
}
}
diff --git a/src/helper/configuration.h b/src/helper/configuration.h
index ff802758..d2e30e77 100644
--- a/src/helper/configuration.h
+++ b/src/helper/configuration.h
@@ -29,5 +29,6 @@ extern void add_config_file_name (const char *cfg);
extern void add_script_search_dir (const char *dir);
extern int configuration_output_handler(struct command_context_s *context, char* line);
extern FILE *open_file_from_path (char *file, char *mode);
+extern char *find_file(char *name);
#endif /* CONFIGURATION_H */