[GNUnet-SVN] r37041 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2016-04-15 19:42:28 +0200 (Fri, 15 Apr 2016)
New Revision: 37041

Modified:
   gnunet/src/include/gnunet_os_lib.h
   gnunet/src/util/program.c
   gnunet/src/util/service.c
Log:
add option to set configuration file to be used by default by libgnunetutil 
routines

Modified: gnunet/src/include/gnunet_os_lib.h
===================================================================
--- gnunet/src/include/gnunet_os_lib.h  2016-04-14 10:24:58 UTC (rev 37040)
+++ gnunet/src/include/gnunet_os_lib.h  2016-04-15 17:42:28 UTC (rev 37041)
@@ -250,6 +250,11 @@
    */
   const char *homepage;
 
+  /**
+   * Configuration file name (in $XDG_CONFIG_HOME) to use.
+   */
+  const char *config_file;
+
 };
 
 

Modified: gnunet/src/util/program.c
===================================================================
--- gnunet/src/util/program.c   2016-04-14 10:24:58 UTC (rev 37040)
+++ gnunet/src/util/program.c   2016-04-15 17:42:28 UTC (rev 37041)
@@ -223,7 +223,7 @@
                      "%s%s%s",
                      xdg,
                      DIR_SEPARATOR_STR,
-                     "gnunet.conf");
+                     GNUNET_OS_project_data_get ()->config_file);
   else
     cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
   lpfx = GNUNET_strdup (binaryName);

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2016-04-14 10:24:58 UTC (rev 37040)
+++ gnunet/src/util/service.c   2016-04-15 17:42:28 UTC (rev 37041)
@@ -1427,7 +1427,7 @@
                      "%s%s%s",
                      xdg,
                      DIR_SEPARATOR_STR,
-                     "gnunet.conf");
+                     GNUNET_OS_project_data_get ()->config_file);
   else
     cfg_fn = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
   memset (&sctx, 0, sizeof (sctx));