Hello,
The attached patch looks straightforward to me, but since this is a
sensitive area in terms of portability, I would like some people to take
a quick look at it.
I am not sure actually how to properly test it.
JMarc
From 99a9ae001062c83e8d8c2efd80bc6d938a35c62b Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Fri, 10 Mar 2017 11:23:55 +0100
Subject: [PATCH] Use FileName::lastModified() intead of stat() in DepTable
This patch removes explicit calls to stat() in the DepTable code. The
original motivation was to get read of a stat() invokation where the
error condition was not checked (spotted by coverity).
---
src/DepTable.cpp | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/DepTable.cpp b/src/DepTable.cpp
index 8351307..47daf39 100644
--- a/src/DepTable.cpp
+++ b/src/DepTable.cpp
@@ -19,8 +19,6 @@
#include "support/lstrings.h"
#include "support/lyxtime.h"
-#include <sys/stat.h>
-
#include <fstream>
using namespace std;
@@ -41,13 +39,11 @@ void DepTable::insert(FileName const & f, bool upd)
if (deplist.find(f) == deplist.end()) {
dep_info di;
di.crc_prev = 0;
- if (upd) {
+ if (upd && f.exists()) {
LYXERR(Debug::DEPEND, " CRC...");
di.crc_cur = f.checksum();
LYXERR(Debug::DEPEND, "done.");
- struct stat f_info;
- stat(f.toFilesystemEncoding().c_str(), &f_info);
- di.mtime_cur = long(f_info.st_mtime);
+ di.mtime_cur = f.lastModified();
} else {
di.crc_cur = 0;
di.mtime_cur = 0;
@@ -66,25 +62,24 @@ void DepTable::update()
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");
} else {
di.crc_prev = di.crc_cur;
LYXERR(Debug::DEPEND, itr->first << " CRC... ");
- di.crc_cur = itr->first.checksum();
+ 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.");
+ LYXERR(Debug::DEPEND, fn << " doesn't exist. removing from DepTable.");
DepList::iterator doomed = itr++;
deplist.erase(doomed);
continue;
--
1.7.9.5
