[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: - fix '-c' in applications without base
From: |
gnunet |
Subject: |
[gnunet] branch master updated: - fix '-c' in applications without base config |
Date: |
Mon, 26 Oct 2020 14:52:41 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 092c2c714 - fix '-c' in applications without base config
092c2c714 is described below
commit 092c2c714e085a66834127bfb1e841486fd4f54c
Author: Alessio Vanni <vannilla@firemail.cc>
AuthorDate: Mon Oct 26 01:26:27 2020 +0100
- fix '-c' in applications without base config
---
src/util/configuration_loader.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 51af24a9f..a59477b25 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -63,14 +63,16 @@ GNUNET_CONFIGURATION_load (struct
GNUNET_CONFIGURATION_Handle *cfg,
GNUNET_free (ipath);
}
- if (GNUNET_SYSERR ==
- GNUNET_CONFIGURATION_load_from (cfg,
- baseconfig))
+ char *dname = GNUNET_STRINGS_filename_expand (baseconfig);
+ GNUNET_free (baseconfig);
+
+ if (GNUNET_YES == GNUNET_DISK_directory_test (dname, GNUNET_YES) &&
+ GNUNET_SYSERR == GNUNET_CONFIGURATION_load_from (cfg, dname))
{
- GNUNET_free (baseconfig);
+ GNUNET_free (dname);
return GNUNET_SYSERR; /* no configuration at all found */
}
- GNUNET_free (baseconfig);
+ GNUNET_free (dname);
if ((NULL != filename) &&
(GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, filename)))
{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: - fix '-c' in applications without base config,
gnunet <=