X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph_list.c;h=b979672ec3a0cbb2abb0160bf8a458450c8af763;hp=d767ef945585198691fd737c2d2de5c750f5eb9b;hb=49f649c73d6b8481e40158de5b76e9cbfd4350d5;hpb=9e7f6711d2cebfec79c8038c51037ba79810323c diff --git a/src/graph_list.c b/src/graph_list.c index d767ef9..b979672 100644 --- a/src/graph_list.c +++ b/src/graph_list.c @@ -55,7 +55,6 @@ * Defines */ #define UPDATE_INTERVAL 900 -#define CACHE_FILE "/tmp/collection4.json" /* * Global variables @@ -210,7 +209,7 @@ static int gl_register_file (const graph_ident_t *file, /* {{{ */ return (0); } /* }}} int gl_register_file */ -static int gl_register_ident (const graph_ident_t *ident, /* {{{ */ +static int gl_register_ident (graph_ident_t *ident, /* {{{ */ __attribute__((unused)) void *user_data) { /* TODO: Check for duplicates if multiple data providers are used. */ @@ -269,13 +268,14 @@ static int gl_update_cache (void) /* {{{ */ int fd; yajl_gen handler; yajl_gen_config handler_config = { /* pretty = */ 1, /* indent = */ " " }; + const char *cache_file = graph_config_get_cache_file (); struct flock lock; struct stat statbuf; int status; size_t i; memset (&statbuf, 0, sizeof (statbuf)); - status = stat (CACHE_FILE, &statbuf); + status = stat (cache_file, &statbuf); if (status == 0) { if (statbuf.st_mtime >= gl_last_update) @@ -290,7 +290,7 @@ static int gl_update_cache (void) /* {{{ */ /* Continue writing the file if possible. */ } - fd = open (CACHE_FILE, O_WRONLY | O_TRUNC | O_CREAT, + fd = open (cache_file, O_WRONLY | O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); if (fd < 0) { @@ -620,7 +620,7 @@ static int gl_read_cache (_Bool block) /* {{{ */ int status; time_t now; - fd = open (CACHE_FILE, O_RDONLY); + fd = open (graph_config_get_cache_file (), O_RDONLY); if (fd < 0) { fprintf (stderr, "gl_read_cache: open(2) failed with status %i\n", errno);