* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author Ben Stanley
*
#include "DepTable.h"
#include "support/debug.h"
-#include "support/lyxlib.h"
-#include "support/filetools.h"
+#include "support/FileName.h"
#include "support/lstrings.h"
#include "support/lyxtime.h"
-#include <sys/stat.h>
-
#include <fstream>
-using std::endl;
-using std::flush;
-using std::getline;
-using std::string;
-using std::ofstream;
-using std::ifstream;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::FileName;
-using support::ltrim;
-using support::onlyFilename;
-using support::suffixIs;
-using support::sum;
inline
bool DepTable::dep_info::changed() const
if (deplist.find(f) == deplist.end()) {
dep_info di;
di.crc_prev = 0;
- if (upd) {
+ if (upd && f.exists()) {
LYXERR(Debug::DEPEND, " CRC...");
- di.crc_cur = sum(f);
+ di.crc_cur = f.checksum();
LYXERR(Debug::DEPEND, "done.");
- struct stat f_info;
- stat(f.toFilesystemEncoding().c_str(), &f_info);
- di.mtime_cur = long(f_info.st_mtime);
+ di.mtime_cur = f.lastModified();
} else {
di.crc_cur = 0;
di.mtime_cur = 0;
DepList::iterator itr = deplist.begin();
while (itr != deplist.end()) {
+ FileName const & fn = itr->first;
dep_info &di = itr->second;
- struct stat f_info;
- if (stat(itr->first.toFilesystemEncoding().c_str(), &f_info) == 0) {
- if (di.mtime_cur == f_info.st_mtime) {
+ if (fn.exists()) {
+ if (di.mtime_cur == fn.lastModified()) {
di.crc_prev = di.crc_cur;
LYXERR(Debug::DEPEND, itr->first << " same mtime");
} else {
di.crc_prev = di.crc_cur;
LYXERR(Debug::DEPEND, itr->first << " CRC... ");
- di.crc_cur = sum(itr->first);
+ di.crc_cur = fn.checksum();
LYXERR(Debug::DEPEND, "done");
}
} else {
// file doesn't exist
// remove stale files - if it's re-created, it
// will be re-inserted by deplog.
- LYXERR(Debug::DEPEND, itr->first
- << " doesn't exist. removing from DepTable.");
+ LYXERR(Debug::DEPEND, fn << " doesn't exist. removing from DepTable.");
DepList::iterator doomed = itr++;
deplist.erase(doomed);
continue;
DepList::const_iterator cit = deplist.begin();
DepList::const_iterator end = deplist.end();
for (; cit != end; ++cit) {
- if (cit->second.changed()) return true;
+ if (cit->second.changed())
+ return true;
}
return false;
}
DepList::const_iterator cit = deplist.begin();
DepList::const_iterator end = deplist.end();
for (; cit != end; ++cit) {
- if (suffixIs(cit->first.absFilename(), ext)) {
+ if (suffixIs(cit->first.absFileName(), ext)) {
if (cit->second.changed())
return true;
}
DepList::const_iterator cit = deplist.begin();
DepList::const_iterator end = deplist.end();
for (; cit != end; ++cit) {
- if (suffixIs(cit->first.absFilename(), ext)) {
+ if (suffixIs(cit->first.absFileName(), ext))
return true;
- }
}
return false;
}
DepList::iterator cit = deplist.begin();
DepList::iterator end = deplist.end();
while (cit != end) {
- if (suffixIs(cit->first.absFilename(), suf)) {
+ if (suffixIs(cit->first.absFileName(), suf)) {
// Can't erase the current iterator, but we
// can increment and then erase.
// Deplist is a map so only the erased
deplist[FileName(nome)] = di;
}
- return deplist.size();
+ return !deplist.empty();
}