Point fix, earlier forgotten

[lyx.git] / src / DepTable.C

diff --git a/src/DepTable.C b/src/DepTable.C
index dd487fcd39a1ec27702d19a6b9c6e63411a4d030..ea087b5e5b903eff50fd8f38341177f038e77b6a 100644 (file)
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -1,29 +1,24 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file DepTable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Ben Stanley
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bjønnes
- *           Ben Stanley
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #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>
@@ -36,11 +31,14 @@
 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
@@ -59,7 +57,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);
@@ -78,7 +76,7 @@ void DepTable::insert(string const & fi, bool upd)
 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()) {
@@ -92,7 +90,7 @@ 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 {
@@ -113,7 +111,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;
 }
@@ -225,18 +223,18 @@ 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;
@@ -244,13 +242,15 @@ void DepTable::read(string const & f)
        // 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();
 }