/* 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>
#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 std::make_pair;
using std::ofstream;
using std::ifstream;
+using std::flush;
using std::endl;
+using std::getline;
-inline bool DepTable::dep_info::changed() const
+
+inline
+bool DepTable::dep_info::changed() const
{
return crc_prev != crc_cur && crc_cur != 0;
}
-void DepTable::insert(string const & fi,
- bool upd)
+
+void DepTable::insert(string const & fi, bool upd)
{
// not quite sure if this is the correct place for MakeAbsPath
- string f = MakeAbsPath(fi);
+ string const f = MakeAbsPath(fi);
if (deplist.find(f) == deplist.end()) {
dep_info di;
di.crc_prev = 0;
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()) {
dep_info &di = itr->second;
struct stat f_info;
- if (0 == stat(itr->first.c_str(), &f_info) ) {
+ if (stat(itr->first.c_str(), &f_info) == 0) {
if (di.mtime_cur == f_info.st_mtime) {
di.crc_prev = di.crc_cur;
lyxerr[Debug::DEPEND] << itr->first << " same mtime";
// 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::sumchange() const
{
- for (DepList::const_iterator cit = deplist.begin();
- cit != deplist.end();
- ++cit) {
- if ((*cit).second.changed()) return true;
+ DepList::const_iterator cit = deplist.begin();
+ DepList::const_iterator end = deplist.end();
+ for (; cit != end; ++cit) {
+ if (cit->second.changed()) return true;
}
return false;
}
bool DepTable::haschanged(string const & f) const
{
// not quite sure if this is the correct place for MakeAbsPath
- string fil = MakeAbsPath(f);
+ string const fil = MakeAbsPath(f);
DepList::const_iterator cit = deplist.find(fil);
if (cit != deplist.end()) {
if (cit->second.changed())
bool DepTable::extchanged(string const & ext) const
{
- for (DepList::const_iterator cit = deplist.begin();
- cit != deplist.end();
- ++cit) {
+ DepList::const_iterator cit = deplist.begin();
+ DepList::const_iterator end = deplist.end();
+ for (; cit != end; ++cit) {
if (suffixIs(cit->first, ext)) {
if (cit->second.changed())
return true;
}
-bool DepTable::ext_exist(const string& ext ) const
+bool DepTable::ext_exist(string const & ext) const
{
- for (DepList::const_iterator cit = deplist.begin();
- cit != deplist.end(); ++cit ) {
-
- if ( suffixIs(cit->first, ext) ) {
+ DepList::const_iterator cit = deplist.begin();
+ DepList::const_iterator end = deplist.end();
+ for (; cit != end; ++cit) {
+ if (suffixIs(cit->first, ext)) {
return true;
}
}
return false;
}
+
bool DepTable::exist(string const & fil) const
{
return deplist.find(fil) != deplist.end();
void DepTable::remove_files_with_extension(string const & suf)
{
DepList::iterator cit = deplist.begin();
- while (cit != deplist.end()) {
+ DepList::iterator end = deplist.end();
+ while (cit != end) {
if (suffixIs(cit->first, suf)) {
- // Can't erase the current iterator, but we can increment and then erase.
- // deplist is a map so only the erased iterator is invalidated.
+ // Can't erase the current iterator, but we
+ // can increment and then erase.
+ // Deplist is a map so only the erased
+ // iterator is invalidated.
DepList::iterator doomed = cit++;
deplist.erase(doomed);
continue;
}
- cit++;
+ ++cit;
}
}
void DepTable::remove_file(string const & filename)
{
DepList::iterator cit = deplist.begin();
- while (cit != deplist.end()) {
+ DepList::iterator end = deplist.end();
+ while (cit != end) {
if (OnlyFilename(cit->first) == filename) {
- // Can't erase the current iterator, but we can increment and then erase.
- // deplist is a map so only the erased iterator is invalidated.
+ // Can't erase the current iterator, but we
+ // can increment and then erase.
+ // deplist is a map so only the erased
+ // iterator is invalidated.
DepList::iterator doomed = cit++;
deplist.erase(doomed);
continue;
}
- cit++;
+ ++cit;
}
}
void DepTable::write(string const & f) const
{
ofstream ofs(f.c_str());
- for (DepList::const_iterator cit = deplist.begin();
- cit != deplist.end(); ++cit) {
+ DepList::const_iterator cit = deplist.begin();
+ DepList::const_iterator end = deplist.end();
+ for (; cit != end; ++cit) {
if (lyxerr.debugging(Debug::DEPEND)) {
- // Store the second (most recently calculated) CRC value.
+ // Store the second (most recently calculated)
+ // 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;
}
}
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;
}
}
-
projects / lyx.git / blobdiff