interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fallback to current (working) directory (for appdata_dir). 

To improve integration with system and service managers like systemd
See also getdnsapi/stubby#106
This commit is contained in:
Willem Toorop 2018-05-04 10:40:49 +02:00
parent caab2e8592
commit 99bfe4a287
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/context.c
View File

@ -5057,14 +5057,19 @@ FILE *_getdns_context_get_priv_fp(getdns_context *context, const char *fn)
{ {
char path[_GETDNS_PATH_MAX]; char path[_GETDNS_PATH_MAX];
FILE *f = NULL; FILE *f = NULL;
size_t len; size_t len = _getdns_get_appdata(context, path);
(void) context; (void) context;
if (!(len = _getdns_get_appdata(context, path))) /*
DEBUG_ANCHOR("ERROR %s(): Could nog get application data path\n" * Commented out to enable fallback to current directory
, __FUNC__); *
* if (!(len = _getdns_get_appdata(context, path)))
else if (len + strlen(fn) >= sizeof(path)) * DEBUG_ANCHOR("ERROR %s(): Could nog get application data path\n"
* , __FUNC__);
*
* else
*/
if (len + strlen(fn) >= sizeof(path))
DEBUG_ANCHOR("ERROR %s(): Application data too long\n", __FUNC__); DEBUG_ANCHOR("ERROR %s(): Application data too long\n", __FUNC__);
else if (!strcpy(path + len, fn)) else if (!strcpy(path + len, fn))
@ -5124,13 +5129,18 @@ int _getdns_context_write_priv_file(getdns_context *context,
char path[_GETDNS_PATH_MAX], tmpfn[_GETDNS_PATH_MAX]; char path[_GETDNS_PATH_MAX], tmpfn[_GETDNS_PATH_MAX];
int fd = -1; int fd = -1;
FILE *f = NULL; FILE *f = NULL;
size_t len; size_t len = _getdns_get_appdata(context, path);
if (!(len = _getdns_get_appdata(context, path))) /*
DEBUG_ANCHOR("ERROR %s(): Could nog get application data path\n" * Commented out to enable fallback to current directory
, __FUNC__); *
* if (!(len = _getdns_get_appdata(context, path)))
else if (len + 6 >= sizeof(tmpfn) * DEBUG_ANCHOR("ERROR %s(): Could nog get application data path\n"
* , __FUNC__);
*
* else
*/
if (len + 6 >= sizeof(tmpfn)
|| len + strlen(fn) >= sizeof(path)) || len + strlen(fn) >= sizeof(path))
DEBUG_ANCHOR("ERROR %s(): Application data too long\n", __FUNC__); DEBUG_ANCHOR("ERROR %s(): Application data too long\n", __FUNC__);