From cf2c827a6e3f9a3fd98c1ab2e0c1062cc607895c Mon Sep 17 00:00:00 2001 From: Nestal Wan Date: Mon, 11 Jun 2012 23:32:57 +0800 Subject: [PATCH] Revert "Config dirs is now XDG compliant." This reverts commit 9a76cb8839b11c1701e6b18f6b1bf625571e6412. --- grive/src/Config.cc | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/grive/src/Config.cc b/grive/src/Config.cc index dc073a9..6a66d56 100644 --- a/grive/src/Config.cc +++ b/grive/src/Config.cc @@ -27,30 +27,10 @@ namespace gr { const std::string& Config::Filename() { - static std::string cfg_path; - char *cfg_base; - bool fallback; - - fallback = false; - cfg_base = getenv("XDG_CONFIG_HOME"); - if (!cfg_base) - { - fallback = true; - cfg_base = getenv("HOME"); - /* Clutter the current directory if forced to */ - if (!cfg_base) - cfg_base = (char *)"."; - } + static const char *env_cfg = ::getenv( "GR_CONFIG" ) ; + static const std::string filename = (env_cfg != 0) ? env_cfg : ".grive" ; - cfg_path = cfg_base; - cfg_path += "/"; - if (fallback) /* Hidden folder */ - cfg_path += "."; - cfg_path += "grive"; - cfg_path += "/"; - cfg_path += "config.json"; - - return cfg_path ; + return filename ; } Config::Config() :