~singpolyma/biboumi

33fa1dcd5a87035de1d9b8df65e5c7551b4bbd1b — Florent Le Coz 6 years ago ea0b2f2
Also a xdg_data_path
4 files changed, 22 insertions(+), 5 deletions(-)

M louloulibs/utils/xdg.cpp
M louloulibs/utils/xdg.hpp
M src/main.cpp
M src/test.cpp
M louloulibs/utils/xdg.cpp => louloulibs/utils/xdg.cpp +13 -4
@@ 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");
}

M louloulibs/utils/xdg.hpp => louloulibs/utils/xdg.hpp +1 -0
@@ 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 */

M src/main.cpp => src/main.cpp +1 -1
@@ 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;

M src/test.cpp => src/test.cpp +7 -0
@@ 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;