/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
* Copyright 1995 Matthias Ettrich
* Copyright 1995-2001 The LyX Team.
* 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
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);
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()) {
} 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 << " +";
}
++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;
}
}
-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();
// 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();
}
-