From 33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Fri, 18 Sep 2015 09:39:49 +0200 Subject: Also a xdg_data_path --- louloulibs/utils/xdg.cpp | 17 +++++++++++++---- louloulibs/utils/xdg.hpp | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'louloulibs/utils') diff --git a/louloulibs/utils/xdg.cpp b/louloulibs/utils/xdg.cpp index 7a60dd8..48212a1 100644 --- a/louloulibs/utils/xdg.cpp +++ b/louloulibs/utils/xdg.cpp @@ -3,11 +3,11 @@ #include "louloulibs.h" -std::string xdg_config_path(const std::string& filename) +std::string xdg_path(const std::string& filename, const char* env_var) { - const char* xdg_config_home = ::getenv("XDG_CONFIG_HOME"); - if (xdg_config_home && xdg_config_home[0] == '/') - return std::string{xdg_config_home} + "/" PROJECT_NAME "/" + filename; + const char* xdg_home = ::getenv(env_var); + if (xdg_home && xdg_home[0] == '/') + return std::string{xdg_home} + "/" PROJECT_NAME "/" + filename; else { const char* home = ::getenv("HOME"); @@ -18,3 +18,12 @@ std::string xdg_config_path(const std::string& filename) } } +std::string xdg_config_path(const std::string& filename) +{ + return xdg_path(filename, "XDG_CONFIG_HOME"); +} + +std::string xdg_data_path(const std::string& filename) +{ + return xdg_path(filename, "XDG_DATA_HOME"); +} diff --git a/louloulibs/utils/xdg.hpp b/louloulibs/utils/xdg.hpp index 20f5bb7..15f3d0b 100644 --- a/louloulibs/utils/xdg.hpp +++ b/louloulibs/utils/xdg.hpp @@ -9,5 +9,6 @@ * http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html */ std::string xdg_config_path(const std::string& filename); +std::string xdg_data_path(const std::string& filename); #endif /* XDG_HPP_INCLUDED */ -- cgit v1.2.3