/*
This file is part of GNUnet.
- Copyright (C) 2006, 2007, 2008, 2009, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2006, 2007, 2008, 2009, 2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @author Christian Grothoff
*/
+#include "platform.h"
+#include "gnunet_util_lib.h"
+
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+
+
/**
* Load configuration (starts with defaults, then loads
* system-specific configuration).
const char *filename)
{
char *baseconfig;
- char *ipath;
+ const char *base_config_varname;
+
+ base_config_varname = GNUNET_OS_project_data_get ()->base_config_varname;
+
+ if (NULL != (baseconfig = getenv (base_config_varname)))
+ {
+ baseconfig = GNUNET_strdup (baseconfig);
+ }
+ else
+ {
+ char *ipath;
+
+ ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+ if (NULL == ipath)
+ return GNUNET_SYSERR;
+ GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
+ GNUNET_free (ipath);
+ }
- ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
- if (NULL == ipath)
- return GNUNET_SYSERR;
- baseconfig = NULL;
- GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
- GNUNET_free (ipath);
if (GNUNET_SYSERR ==
- GNUNET_DISK_directory_scan (baseconfig, &parse_configuration_file, cfg))
+ GNUNET_CONFIGURATION_load_from (cfg,
+ baseconfig))
{
GNUNET_free (baseconfig);
return GNUNET_SYSERR; /* no configuration at all found */