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

Bug Fix - rc:alternate

Browse source 
- Fixed handling of rc: alternate rc file.
- Reorganized Config.cpp regarding defaults.  More work needed.
This commit is contained in:
Paul Beckingham 2009-06-15 17:31:29 -04:00
parent 4470c3b88c
commit 00c5e61d49
6 changed files with 147 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/TDB.cpp
View file

@ -197,7 +197,7 @@ int TDB::loadPending (std::vector <Task>& tasks, Filter& filter)
catch (std::string& e)
{
std::stringstream s;
s << " int " << file << " at line " << line_number;
s << " in " << file << " at line " << line_number;
throw e + s.str ();
}
@ -228,10 +228,13 @@ int TDB::loadCompleted (std::vector <Task>& tasks, Filter& filter)
while (fgets (line, T_LINE_MAX, location->completed))
{
int length = ::strlen (line);
if (length > 1)
if (length > 2)
{
// TODO Add hidden attribute indicating source?
line[length - 1] = '\0'; // Kill \n
if (line[length - 1] == '\n')
line[length - 1] = '\0';
Task task (line);
task.id = mId++;
@ -247,7 +250,7 @@ int TDB::loadCompleted (std::vector <Task>& tasks, Filter& filter)
catch (std::string& e)
{
std::stringstream s;
s << " int " << file << " at line " << line_number;
s << " in " << file << " at line " << line_number;
throw e + s.str ();
}
@ -352,8 +355,10 @@ int TDB::gc ()
// completed list. Isn't garbage collection easy?
foreach (task, pending)
{
if (task->getStatus () == Task::completed ||
task->getStatus () == Task::deleted)
std::string st = task->get ("status");
Task::status s = task->getStatus ();
if (s == Task::completed ||
s == Task::deleted)
{
completed.push_back (*task);
pending.erase (task);