X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.C;h=90849bb0d770ca7e2e5687a8abadcda0eab15609;hb=eead5ba43d0ddf06544ad1b40063981d3788c635;hp=6a358dec460d62e4ca9926499fd7a44ae6a4eede;hpb=7ea7dabed1b72cc25dcbdc482ac006f2b61dacfd;p=lyx.git

diff --git a/src/DepTable.C b/src/DepTable.C
index 6a358dec46..90849bb0d7 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -1,6 +1,6 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
  *	     Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The LyX Team.
@@ -9,33 +9,38 @@
  *           Lars Gullik Bjønnes
  *           Ben Stanley
  *
- * ====================================================== 
+ * ======================================================
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "DepTable.h"
 #include "debug.h"
 
 #include "support/lyxlib.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/lyxtime.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include <fstream>
+#include <ctime>
+
+#ifndef CXX_GLOBAL_CSTD
+using std::time;
+#endif
+
+using namespace lyx::support;
 
 using std::make_pair;
 using std::ofstream;
 using std::ifstream;
 using std::flush;
 using std::endl;
+using std::getline;
 
 
 inline
@@ -54,7 +59,7 @@ void DepTable::insert(string const & fi, bool upd)
 		di.crc_prev = 0;
 		if (upd) {
 			lyxerr[Debug::DEPEND] << " CRC..." << flush;
-			di.crc_cur = lyx::sum(f);
+			di.crc_cur = sum(f);
 			lyxerr[Debug::DEPEND] << "done." << endl;
 			struct stat f_info;
 			stat(fi.c_str(), &f_info);
@@ -68,12 +73,12 @@ void DepTable::insert(string const & fi, bool upd)
 		lyxerr[Debug::DEPEND] << " Already in DepTable" << endl;
 	}
 }
-		
+
 
 void DepTable::update()
 {
 	lyxerr[Debug::DEPEND] << "Updating DepTable..." << endl;
-	time_t start_time = time(0);
+	lyx::time_type const start_time = lyx::current_time();
 
 	DepList::iterator itr = deplist.begin();
 	while (itr != deplist.end()) {
@@ -87,20 +92,20 @@ void DepTable::update()
 			} else {
 				di.crc_prev = di.crc_cur;
 				lyxerr[Debug::DEPEND] << itr->first << " CRC... ";
-				di.crc_cur = lyx::sum(itr->first);
+				di.crc_cur = sum(itr->first);
 				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 
+			lyxerr[Debug::DEPEND] << itr->first
 				<< " doesn't exist. removing from DepTable." << endl;
 			DepList::iterator doomed = itr++;
 			deplist.erase(doomed);
 			continue;
 		}
-		
+
 		if (lyxerr.debugging(Debug::DEPEND)) {
 			if (di.changed())
 				lyxerr << " +";
@@ -108,7 +113,7 @@ void DepTable::update()
 		}
 		++itr;
 	}
-	time_t time_sec = time(0) - start_time;
+	lyx::time_type const time_sec = lyx::current_time() - start_time;
 	lyxerr[Debug::DEPEND] << "Finished updating DepTable ("
 		<< time_sec << " sec)." << endl;
 }
@@ -152,7 +157,7 @@ bool DepTable::extchanged(string const & ext) const
 }
 
 
-bool DepTable::ext_exist(const string& ext) const
+bool DepTable::ext_exist(string const & ext) const
 {
 	DepList::const_iterator cit = deplist.begin();
 	DepList::const_iterator end = deplist.end();
@@ -220,33 +225,34 @@ void DepTable::write(string const & f) const
 			// CRC value.
 			// The older one is effectively set to 0 upon re-load.
 			lyxerr << "Write dep: "
-			       << cit->first << " "
-			       << cit->second.crc_cur << " "
-			       << cit->second.mtime_cur << endl;
+			       << cit->second.crc_cur << ' '
+			       << cit->second.mtime_cur << ' '
+			       << cit->first << endl;
 		}
-		ofs << cit->first << " "
-		    << cit->second.crc_cur << " "
-		    << cit->second.mtime_cur << endl;
+		ofs << cit->second.crc_cur << ' '
+		    << cit->second.mtime_cur << ' '
+		    << cit->first << endl;
 	}
 }
 
 
-void DepTable::read(string const & f)
+bool DepTable::read(string const & f)
 {
 	ifstream ifs(f.c_str());
 	string nome;
 	dep_info di;
 	// This doesn't change through the loop.
 	di.crc_prev = 0;
-	
-	while (ifs >> nome >> di.crc_cur >> di.mtime_cur) {
+
+	while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) {
+		nome = ltrim(nome);
 		if (lyxerr.debugging(Debug::DEPEND)) {
 			lyxerr << "Read dep: "
-			       << nome << " "
-			       << di.crc_cur << " "
-			       << di.mtime_cur << endl;
+			       << di.crc_cur << ' '
+			       << di.mtime_cur << ' '
+			       << nome << endl;
 		}
 		deplist[nome] = di;
 	}
+	return deplist.size();
 }
-