GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch '1.9.0' of tasktools.org:task into 1.9.0

Browse source
This commit is contained in:
Federico Hernandez 2010-01-12 23:15:19 +01:00
commit b001c2f40b
8 changed files with 37 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Config.cpp
View file

@ -32,6 +32,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <pwd.h>
#include "Path.h"
#include "Config.h"
#include "text.h"
#include "util.h"
@ -99,16 +100,16 @@ bool Config::load (const std::string& file, int nest /* = 1 */)
std::string::size_type include = line.find ("include"); // no i18n.
if (include != std::string::npos)
{
std::string included = expandPath ( trim ( line.substr (include + 7), " \t"));
if (isAbsolutePath (included))
Path included (trim (line.substr (include + 7), " \t"));
if (included.is_absolute ())
{
if (!access (included.c_str (), F_OK | R_OK))
this->load (included, nest + 1);
if (included.readable ())
this->load (included.data, nest + 1);
else
throw std::string ("Could not read include file '") + included + "'";
throw std::string ("Could not read include file '") + included.data + "'";
}
else
throw std::string ("Can only include files with absolute paths, not '") + included + "'";
throw std::string ("Can only include files with absolute paths, not '") + included.data + "'";
}
else
throw std::string ("Malformed entry in ") + file + ": '" + line + "'";
@ -294,7 +295,8 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
////////////////////////////////////////////////////////////////////////////////
void Config::createDefaultData (const std::string& data)
{
if (access (data.c_str (), F_OK))
Path p (data);
if (! p.exists ())
mkdir (data.c_str (), S_IRWXU);
}