Blinker

@@ -18,9 +18,10 @@ namespace Blinker {

  * @param[in] path path to file

  */

 File::File(const std::string &path):

-  m_path(path),

-  m_lastCheck(Time::now())

+  m_path(path)

 {

+  // get modification time

+  checkModified();

 }

 /**

@@ -38,22 +39,20 @@ const std::string & File::getPath()

  */

 bool File::checkModified()

 {

-  /* get current time before getting modification time

-     for not missing any modification */

-  Time now = Time::now();

-

   // get modification/change times

   struct stat s;

   if (stat(m_path.c_str(), &s))

     return false; // cannot stat -> silently ignore

-  Time modified(s.st_mtime);

-  Time changed(s.st_ctime);

+  Time modifyTime(s.st_mtime);

+  Time changeTime(s.st_ctime);

+  if (changeTime > modifyTime) // treat change same way as modify

+    modifyTime = changeTime;

-  // has file been modified/changed since last check

-  bool mod = modified >= m_lastCheck || changed >= m_lastCheck;

+  // consider file modified if modify time changed since last check

+  bool mod = modifyTime > m_lastModifyTime;

-  // remember "now" as last check time

-  m_lastCheck = now;

+  // remember new modify time

+  m_lastModifyTime = modifyTime;

   return mod;

 }

@@ -37,7 +37,7 @@ public:

 protected:

   std::string m_path;           ///< path to file

-  Time m_lastCheck; ///< last time modification time was checked

+  Time        m_lastModifyTime; ///< last known modification time was checked

 }; // class File

 } // namespace Blinker