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

Bug #1200

Browse source 
- #1200 Directory d_type==DT_UNKNOWN is now handled correctly (thanks to Jakub
  Wilk).
This commit is contained in:
Paul Beckingham 2013-04-13 13:37:16 -04:00
parent 0ea28ef8a3
commit 68a12908d2
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -20,6 +20,8 @@ Features
Bugs Bugs
+ #1196 Now builds on Hurd (thanks to Jakub Wilk). + #1196 Now builds on Hurd (thanks to Jakub Wilk).
+ #1197 Now 'tasksh' recognizes Ctrl-D to exit. + #1197 Now 'tasksh' recognizes Ctrl-D to exit.
+ #1200 Directory d_type==DT_UNKNOWN is now handled correctly (thanks to Jakub
Wilk).
+ #1211 The 'dateformat' settings now default to the ISO-8601 standard of + #1211 The 'dateformat' settings now default to the ISO-8601 standard of
'Y-M-D' (thanks to Robin Björklin). 'Y-M-D' (thanks to Robin Björklin).
+ #1222 The 'summary' report now obeys the 'color.label' setting (thanks to + #1222 The 'summary' report now obeys the 'color.label' setting (thanks to

17
src/Directory.cpp
View file

@ -117,8 +117,14 @@ bool Directory::remove_directory (const std::string& dir)
else else
unlink ((dir + "/" + de->d_name).c_str ()); unlink ((dir + "/" + de->d_name).c_str ());
#else #else
if (de->d_type == DT_DIR || if (de->d_type == DT_UNKNOWN)
de->d_type == DT_UNKNOWN) {
struct stat s;
lstat ((dir + "/" + de->d_name).c_str (), &s);
if (s.st_mode & S_IFDIR)
de->d_type = DT_DIR;
}
if (de->d_type == DT_DIR)
remove_directory (dir + "/" + de->d_name); remove_directory (dir + "/" + de->d_name);
else else
unlink ((dir + "/" + de->d_name).c_str ()); unlink ((dir + "/" + de->d_name).c_str ());
@ -209,6 +215,13 @@ void Directory::list (
else else
results.push_back (base + "/" + de->d_name); results.push_back (base + "/" + de->d_name);
#else #else
if (recursive && de->d_type == DT_UNKNOWN)
{
struct stat s;
lstat ((base + "/" + de->d_name).c_str (), &s);
if (s.st_mode & S_IFDIR)
de->d_type = DT_DIR;
}
if (recursive && de->d_type == DT_DIR) if (recursive && de->d_type == DT_DIR)
list (base + "/" + de->d_name, results, recursive); list (base + "/" + de->d_name, results, recursive);
else else