#include "SpellChecker.h"
#include "sgml.h"
#include "TexRow.h"
-#include "TexStream.h"
#include "Text.h"
#include "TextClass.h"
#include "TocBackend.h"
#include "support/gzstream.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h"
+#include "support/mutex.h"
#include "support/os.h"
#include "support/Package.h"
#include "support/PathChanger.h"
/// Creates the per buffer temporary directory
static FileName createBufferTmpDir()
{
- static int count;
+ // FIXME This would be the ideal application for a TempDir class (like
+ // TempFile but for directories)
+ string counter;
+ {
+ static int count;
+ static Mutex mutex;
+ Mutex::Locker locker(&mutex);
+ counter = convert<string>(count++);
+ }
// We are in our own directory. Why bother to mangle name?
// In fact I wrote this code to circumvent a problematic behaviour
// (bug?) of EMX mkstemp().
FileName tmpfl(package().temp_dir().absFileName() + "/lyx_tmpbuf" +
- convert<string>(count++));
+ counter);
if (!tmpfl.createDirectory(0777)) {
throw ExceptionMessage(WarningException, _("Disk Error: "), bformat(
// Copy child authors to the params. We need those pointers.
AuthorList const & child_authors = params().authors();
AuthorList::Authors::const_iterator it = child_authors.begin();
- for (; it != child_authors.end(); it++)
+ for (; it != child_authors.end(); ++it)
mparams.authors().record(*it);
return mparams;
}
readHeader(lex);
- if (params().outputChanges) {
+ if (params().output_changes) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
LaTeXFeatures::isAvailable("xcolor");
Lexer lex;
istringstream is(s);
lex.setStream(is);
- FileName const fn = FileName::tempName("Buffer_readString");
+ TempFile tempfile("Buffer_readStringXXXXXX.lyx");
+ FileName const fn = tempfile.name();
int file_format;
bool success = parseLyXFormat(lex, fn, file_format) == ReadSuccess;
else if (success)
if (readDocument(lex))
success = false;
- if (fn.exists())
- fn.removeFile();
return success;
}
Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
FileName & tmpfile, int from_format)
{
- tmpfile = FileName::tempName("Buffer_convertLyXFormatXXXXXX.lyx");
+ TempFile tempfile("Buffer_convertLyXFormatXXXXXX.lyx");
+ tempfile.setAutoRemove(false);
+ tmpfile = tempfile.name();
if(tmpfile.empty()) {
Alert::error(_("Conversion failed"),
bformat(_("%1$s is from a different"
// We don't need autosaves in the immediate future. (Asger)
resetAutosaveTimers();
- FileName backupName;
- bool madeBackup = false;
+ // if the file does not yet exist, none of the backup activity
+ // that follows is necessary
+ if (!fileName().exists())
+ return writeFile(fileName());
+
+ // we first write the file to a new name, then move it to its
+ // proper location once that has been done successfully. that
+ // way we preserve the original file if something goes wrong.
+ TempFile tempfile(fileName().onlyPath(), "tmpXXXXXX.lyx");
+ FileName savefile(tempfile.name());
- // make a backup if the file already exists
- if (lyxrc.make_backup && fileName().exists()) {
- backupName = FileName(absFileName() + '~');
+ LYXERR(Debug::FILES, "Saving to " << savefile.absFileName());
+ if (!writeFile(savefile))
+ return false;
+
+ // we will set this to false if we fail
+ bool made_backup = true;
+ bool const symlink = fileName().isSymLink();
+ if (lyxrc.make_backup) {
+ FileName backupName(absFileName() + '~');
if (!lyxrc.backupdir_path.empty()) {
string const mangledName =
subst(subst(backupName.absFileName(), '/', '!'), ':', '!');
// Except file is symlink do not copy because of #6587.
// Hard links have bad luck.
- if (fileName().isSymLink())
- madeBackup = fileName().copyTo(backupName);
- else
- madeBackup = fileName().moveTo(backupName);
+ made_backup = symlink ?
+ fileName().copyTo(backupName):
+ fileName().moveTo(backupName);
- if (!madeBackup) {
+ if (!made_backup) {
Alert::error(_("Backup failure"),
bformat(_("Cannot create backup file %1$s.\n"
"Please check whether the directory exists and is writable."),
}
}
- if (writeFile(d->filename)) {
+ // If we have no symlink, we can simply rename the temp file.
+ // Otherwise, we need to copy it so the symlink stays intact.
+ if (!symlink)
+ tempfile.setAutoRemove(false);
+ if (made_backup &&
+ (symlink ? savefile.copyTo(fileName(), true) : savefile.moveTo(fileName()))) {
+ // saveCheckSum() was already called by writeFile(), but the
+ // time stamp is invalidated by copying/moving
+ saveCheckSum();
markClean();
return true;
- } else {
- // Saving failed, so backup is not backup
- if (madeBackup)
- backupName.moveTo(d->filename);
- return false;
}
+ // else
+ Alert::error(_("Write failure"),
+ bformat(_("Cannot move saved file to:\n %1$s.\n"
+ "But the file has successfully been saved as:\n %2$s."),
+ from_utf8(fileName().absFileName()),
+ from_utf8(savefile.absFileName())));
+ return false;
}
if (!openFileWrite(ofs, fname))
return false;
- //TexStream ts(ofs.rdbuf(), &texrow());
ErrorList & errorList = d->errorLists["Export"];
errorList.clear();
bool failed_export = false;
}
-void Buffer::getSourceCode(odocstream & os, string const format,
+void Buffer::getSourceCode(odocstream & os, string const & format,
pit_type par_begin, pit_type par_end,
OutputWhat output, bool master) const
{
// to fork. But we will do the save
// anyway.
bool failed = false;
- FileName const tmp_ret = FileName::tempName("lyxauto");
+ TempFile tempfile("lyxautoXXXXXX.lyx");
+ tempfile.setAutoRemove(false);
+ FileName const tmp_ret = tempfile.name();
if (!tmp_ret.empty()) {
- buffer_.writeFile(tmp_ret);
- // assume successful write of tmp_ret
- if (!tmp_ret.moveTo(fname_))
+ if (!buffer_.writeFile(tmp_ret))
+ failed = true;
+ else if (!tmp_ret.moveTo(fname_))
failed = true;
} else
failed = true;
// If this buffer is cloned, we assume that
// we are running in a separate thread already.
- FileName const tmp_ret = FileName::tempName("lyxauto");
+ TempFile tempfile("lyxautoXXXXXX.lyx");
+ tempfile.setAutoRemove(false);
+ FileName const tmp_ret = tempfile.name();
if (!tmp_ret.empty()) {
writeFile(tmp_ret);
// assume successful write of tmp_ret