X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.cpp;h=8b15ec745dedf64aaada71fef1a8a5183a2ea6c5;hb=e87ace901a4e52ab8cb7461d3c4910e04320d652;hp=e8258dc419418d2f1b23cbb57fb04d53586ba1e2;hpb=329a8db14abf6a236c94c7902891a2ca9be919f4;p=lyx.git

diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index e8258dc419..8b15ec745d 100644
--- a/src/DepTable.cpp
+++ b/src/DepTable.cpp
@@ -3,7 +3,7 @@
  * 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
  *
@@ -14,32 +14,18 @@
 
 #include "DepTable.h"
 
-#include "debug.h"
-
-#include "support/lyxlib.h"
-#include "support/filetools.h"
+#include "support/debug.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
@@ -53,50 +39,47 @@ void DepTable::insert(FileName const & f, bool upd)
 	if (deplist.find(f) == deplist.end()) {
 		dep_info di;
 		di.crc_prev = 0;
-		if (upd) {
-			LYXERR(Debug::DEPEND) << " CRC..." << flush;
-			di.crc_cur = sum(f);
-			LYXERR(Debug::DEPEND) << "done." << endl;
-			struct stat f_info;
-			stat(f.toFilesystemEncoding().c_str(), &f_info);
-			di.mtime_cur = long(f_info.st_mtime);
+		if (upd && f.exists()) {
+			LYXERR(Debug::DEPEND, " CRC...");
+			di.crc_cur = f.checksum();
+			LYXERR(Debug::DEPEND, "done.");
+			di.mtime_cur = f.lastModified();
 		} else {
 			di.crc_cur = 0;
 			di.mtime_cur = 0;
 		}
 		deplist[f] = di;
 	} else {
-		LYXERR(Debug::DEPEND) << " Already in DepTable" << endl;
+		LYXERR(Debug::DEPEND, " Already in DepTable");
 	}
 }
 
 
 void DepTable::update()
 {
-	LYXERR(Debug::DEPEND) << "Updating DepTable..." << endl;
-	time_type const start_time = current_time();
+	LYXERR(Debug::DEPEND, "Updating DepTable...");
+	time_t const start_time = current_time();
 
 	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" << endl;
+				LYXERR(Debug::DEPEND, itr->first << " same mtime");
 			} else {
 				di.crc_prev = di.crc_cur;
-				LYXERR(Debug::DEPEND) << itr->first << " CRC... " << flush;
-				di.crc_cur = sum(itr->first);
-				LYXERR(Debug::DEPEND) << "done" << endl;
+				LYXERR(Debug::DEPEND, itr->first << " CRC... ");
+				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." << endl;
+			LYXERR(Debug::DEPEND, fn << " doesn't exist. removing from DepTable.");
 			DepList::iterator doomed = itr++;
 			deplist.erase(doomed);
 			continue;
@@ -109,9 +92,9 @@ void DepTable::update()
 		}
 		++itr;
 	}
-	time_type const time_sec = current_time() - start_time;
-	LYXERR(Debug::DEPEND) << "Finished updating DepTable ("
-		<< time_sec << " sec)." << endl;
+	time_t const time_sec = current_time() - start_time;
+	LYXERR(Debug::DEPEND, "Finished updating DepTable ("
+		<< long(time_sec) << " sec).");
 }
 
 
@@ -120,7 +103,8 @@ bool DepTable::sumchange() const
 	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;
 }
@@ -142,7 +126,7 @@ bool DepTable::extchanged(string const & ext) const
 	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;
 		}
@@ -156,9 +140,8 @@ bool DepTable::ext_exist(string const & ext) const
 	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;
 }
@@ -175,7 +158,7 @@ void DepTable::remove_files_with_extension(string const & suf)
 	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
@@ -217,10 +200,10 @@ void DepTable::write(FileName const & f) const
 		// Store the second (most recently calculated)
 		// CRC value.
 		// The older one is effectively set to 0 upon re-load.
-		LYXERR(Debug::DEPEND) << "Write dep: "
+		LYXERR(Debug::DEPEND, "Write dep: "
 		       << cit->second.crc_cur << ' '
 		       << cit->second.mtime_cur << ' '
-		       << cit->first << endl;
+		       << cit->first);
 
 		ofs << cit->second.crc_cur << ' '
 		    << cit->second.mtime_cur << ' '
@@ -240,12 +223,12 @@ bool DepTable::read(FileName const & f)
 	while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
 		nome = ltrim(nome);
 
-		LYXERR(Debug::DEPEND) << "Read dep: "
-		       << di.crc_cur << ' ' << di.mtime_cur << ' ' << nome << endl;
+		LYXERR(Debug::DEPEND, "Read dep: "
+		       << di.crc_cur << ' ' << di.mtime_cur << ' ' << nome);
 
 		deplist[FileName(nome)] = di;
 	}
-	return deplist.size();
+	return !deplist.empty();
 }