X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=56a39c775d76da772180919699623742d7a34c99;hb=14001c49fe0fb3d95a0f69f63344e7ae59d28180;hp=41072302cd93952b5544728988f74aef36f21ebe;hpb=01865146313ef24a9d36ee39d1212655bfed637b;p=lyx.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 41072302cd..56a39c775d 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -22,11 +22,10 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
-#include "support/lyxlib.h"
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 #include <boost/crc.hpp>
 
 #include <algorithm>
@@ -108,7 +107,7 @@ void ConverterCache::Impl::readIndex()
 	time_t const now = current_time();
 	FileName const index(addName(cache_dir.absFilename(), "index"));
 	ifstream is(index.toFilesystemEncoding().c_str());
-	Lexer lex(0, 0);
+	Lexer lex;
 	lex.setStream(is);
 	while (lex.isOK()) {
 		if (!lex.next(true))
@@ -169,7 +168,7 @@ void ConverterCache::Impl::writeIndex()
 	FileName const index(addName(cache_dir.absFilename(), "index"));
 	ofstream os(index.toFilesystemEncoding().c_str());
 	os.close();
-	if (!chmod(index, 0600))
+	if (!index.changePermission(0600))
 		return;
 	os.open(index.toFilesystemEncoding().c_str());
 	CacheType::iterator it1 = cache.begin();
@@ -217,9 +216,6 @@ ConverterCache::ConverterCache()
 
 ConverterCache::~ConverterCache()
 {
-	if (!lyxrc.use_converter_cache)
-		return;
-	pimpl_->writeIndex();
 	delete pimpl_;
 }
 
@@ -240,7 +236,7 @@ void ConverterCache::init()
 	// initialized after all static variables.
 	cache_dir = FileName(addName(package().user_support().absFilename(), "cache"));
 	if (!cache_dir.exists())
-		if (support::mkdir(cache_dir, 0700) != 0) {
+		if (!cache_dir.createDirectory(0700)) {
 			lyxerr << "Could not create cache directory `"
 			       << cache_dir << "'." << endl;
 			exit(EXIT_FAILURE);
@@ -249,18 +245,9 @@ void ConverterCache::init()
 }
 
 
-static bool changeMode(FileName const & fname, unsigned long int mode)
+void ConverterCache::writeIndex() const
 {
-	if (mode == (unsigned long int)-1)
-		return true;
-
-	ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::binary | ios::out | ios::trunc);
-	if (!ofs)
-		return false;
-	ofs.close();
-	if (!chmod(fname, mode))
-		return false;
-	return true;
+	pimpl_->writeIndex();
 }
 
 
@@ -307,20 +294,18 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
 		              onlyFilename(item->cache_name.absFilename()))) {
 			LYXERR(Debug::FILES, "Could not copy file " << orig_from << " to "
 				<< item->cache_name);
-		} else if (!changeMode(item->cache_name, 0600)) {
+		} else if (!item->cache_name.changePermission(0600)) {
 			LYXERR(Debug::FILES, "Could not change file mode"
 				<< item->cache_name);
 		}
 	} else {
 		CacheItem new_item(orig_from, to_format, timestamp,
 				orig_from.checksum());
-		// FIXME: The original code used to chmod the new file to 600.
-		// See SpecialisedMover::do_copy().
 		if (mover.copy(converted_file, new_item.cache_name,
 		              onlyFilename(new_item.cache_name.absFilename()))) {
-			if (!changeMode(item->cache_name, 0600)) {
+			if (!new_item.cache_name.changePermission(0600)) {
 				LYXERR(Debug::FILES, "Could not change file mode"
-					<< item->cache_name);
+					<< new_item.cache_name);
 			}
 			FormatCache & format_cache = pimpl_->cache[orig_from];
 			if (format_cache.from_format.empty())
@@ -427,7 +412,7 @@ FileName const & ConverterCache::cacheName(FileName const & orig_from,
 	LYXERR(Debug::FILES, orig_from << ' ' << to_format);
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	BOOST_ASSERT(item);
+	LASSERT(item, /**/);
 	return item->cache_name;
 }
 
@@ -451,7 +436,7 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
 	}
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	BOOST_ASSERT(item);
+	LASSERT(item, /**/);
 	Mover const & mover = getMover(to_format);
 	return mover.copy(item->cache_name, dest,
 	                  onlyFilename(dest.absFilename()));