Also a xdg_data_path

This commit is contained in:
Florent Le Coz
2015-09-18 21:50:54 +02:00
parent ea0b2f2bb8
commit 33fa1dcd5a
4 changed files with 22 additions and 5 deletions
+1 -1
View File
@@ -69,7 +69,7 @@ int main(int ac, char** av)
if (ac > 1)
Config::filename = av[1];
else
Config::filename = xdg_path("biboumi.cfg");
Config::filename = xdg_config_path("biboumi.cfg");
Config::file_must_exist = true;
std::cerr << "Using configuration file: " << Config::filename << std::endl;
+7
View File
@@ -13,6 +13,7 @@
#include <utils/revstr.hpp>
#include <irc/irc_user.hpp>
#include <utils/split.hpp>
#include <utils/xdg.hpp>
#include <xmpp/jid.hpp>
#include <irc/iid.hpp>
#include <string.h>
@@ -423,6 +424,12 @@ int main()
res = xdg_config_path("coucou.txt");
std::cout << res << std::endl;
assert(res == "/some_weird_dir/biboumi/coucou.txt");
::setenv("XDG_DATA_HOME", "/datadir", 1);
res = xdg_data_path("bonjour.txt");
std::cout << res << std::endl;
assert(res == "/datadir/biboumi/bonjour.txt");
}
return 0;