#include "graphics/Previews.h"
-#include "support/FileInfo.h"
#include "support/filetools.h"
-#include "support/gzstream.h"
+#include "support/fs_extras.h"
+#ifdef USE_COMPRESSION
+# include "support/gzstream.h"
+#endif
#include "support/lyxlib.h"
#include "support/os.h"
#include "support/path.h"
#include "support/convert.h"
#include <boost/bind.hpp>
+#include <boost/filesystem/operations.hpp>
#include <utime.h>
#include <iomanip>
#include <stack>
#include <sstream>
+#include <fstream>
using lyx::pos_type;
using lyx::support::cmd_ret;
using lyx::support::createBufferTmpDir;
using lyx::support::destroyDir;
-using lyx::support::FileInfo;
-using lyx::support::FileInfo;
using lyx::support::getFormatFromContents;
using lyx::support::IsDirWriteable;
-using lyx::support::IsFileWriteable;
using lyx::support::LibFileSearch;
using lyx::support::ltrim;
using lyx::support::MakeAbsPath;
using lyx::support::rename;
using lyx::support::RunCommand;
using lyx::support::split;
-using lyx::support::strToInt;
using lyx::support::subst;
using lyx::support::tempName;
using lyx::support::trim;
namespace os = lyx::support::os;
+namespace fs = boost::filesystem;
using std::endl;
using std::for_each;
namespace {
-int const LYX_FORMAT = 239;
+int const LYX_FORMAT = 241;
} // namespace anon
filename(file), filepath(OnlyPath(file)), file_fully_loaded(false),
inset(params)
{
+ inset.setAutoBreakRows(true);
lyxvc.buffer(&parent);
temppath = createBufferTmpDir();
// FIXME: And now do something if temppath == string(), because we
closing();
- if (!temppath().empty() && destroyDir(temppath()) != 0) {
+ if (!temppath().empty() && !destroyDir(temppath())) {
Alert::warning(_("Could not remove temporary directory"),
bformat(_("Could not remove the temporary directory %1$s"), temppath()));
}
// If no Latex log or Build log is newer, show Build log
- FileInfo const f_fi(fname);
- FileInfo const b_fi(bname);
-
- if (b_fi.exist() &&
- (!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) {
+ if (fs::exists(bname) &&
+ (!fs::exists(fname) || fs::last_write_time(fname) < fs::last_write_time(bname))) {
lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
return make_pair(Buffer::buildlog, bname);
}
{
pimpl_->filename = MakeAbsPath(newfile);
pimpl_->filepath = OnlyPath(pimpl_->filename);
- setReadonly(IsFileWriteable(pimpl_->filename) == 0);
+ setReadonly(fs::is_readonly(pimpl_->filename));
updateTitles();
}
string unknown = params().readToken(lex, token);
if (!unknown.empty()) {
- if (unknown[0] != '\\' and token == "\\textclass") {
+ if (unknown[0] != '\\' && token == "\\textclass") {
unknownClass(unknown);
} else {
++unknown_tokens;
// needed to insert the selection
void Buffer::insertStringAsLines(ParagraphList & pars,
- pit_type & par, pos_type & pos,
+ pit_type & pit, pos_type & pos,
LyXFont const & fn, string const & str, bool autobreakrows)
{
- LyXLayout_ptr const & layout = pars[par].layout();
-
LyXFont font = fn;
- pars[par].checkInsertChar(font);
+ pars[pit].checkInsertChar(font);
// insert the string, don't insert doublespace
bool space_inserted = true;
for (string::const_iterator cit = str.begin();
- cit != str.end(); ++cit) {
+ cit != str.end(); ++cit) {
+ Paragraph & par = pars[pit];
if (*cit == '\n') {
- if (autobreakrows && (!pars[par].empty() || pars[par].allowEmpty())) {
- breakParagraph(params(), paragraphs(), par, pos,
- layout->isEnvironment());
- ++par;
+ if (autobreakrows && (!par.empty() || par.allowEmpty())) {
+ breakParagraph(params(), pars, pit, pos,
+ par.layout()->isEnvironment());
+ ++pit;
pos = 0;
space_inserted = true;
} else {
}
// do not insert consecutive spaces if !free_spacing
} else if ((*cit == ' ' || *cit == '\t') &&
- space_inserted && !pars[par].isFreeSpacing()) {
+ space_inserted && !par.isFreeSpacing()) {
continue;
} else if (*cit == '\t') {
- if (!pars[par].isFreeSpacing()) {
+ if (!par.isFreeSpacing()) {
// tabs are like spaces here
- pars[par].insertChar(pos, ' ', font);
+ par.insertChar(pos, ' ', font);
++pos;
space_inserted = true;
} else {
const pos_type n = 8 - pos % 8;
for (pos_type i = 0; i < n; ++i) {
- pars[par].insertChar(pos, ' ', font);
+ par.insertChar(pos, ' ', font);
++pos;
}
space_inserted = true;
continue;
} else {
// just insert the character
- pars[par].insertChar(pos, *cit, font);
+ par.insertChar(pos, *cit, font);
++pos;
space_inserted = (*cit == ' ');
}
//lyxerr << " dot found at " << dot << endl;
if (dot != string::npos)
tmp_format.erase(dot, 1);
- int file_format = strToInt(tmp_format);
+ int const file_format = convert<int>(tmp_format);
//lyxerr << "format: " << file_format << endl;
if (file_format != LYX_FORMAT) {
filename));
return false;
} else {
- bool ret = readFile(tmpfile, pit);
+ bool const ret = readFile(tmpfile, pit);
// Do stuff with tmpfile name and buffer name here.
return ret;
}
s = AddName(lyxrc.backupdir_path,
subst(os::internal_path(s),'/','!'));
- // Rename is the wrong way of making a backup,
- // this is the correct way.
- /* truss cp fil fil2:
- lstat("LyXVC3.lyx", 0xEFFFF898) Err#2 ENOENT
- stat("LyXVC.lyx", 0xEFFFF688) = 0
- open("LyXVC.lyx", O_RDONLY) = 3
- open("LyXVC3.lyx", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4
- fstat(4, 0xEFFFF508) = 0
- fstat(3, 0xEFFFF508) = 0
- read(3, " # T h i s f i l e w".., 8192) = 5579
- write(4, " # T h i s f i l e w".., 5579) = 5579
- read(3, 0xEFFFD4A0, 8192) = 0
- close(4) = 0
- close(3) = 0
- chmod("LyXVC3.lyx", 0100644) = 0
- lseek(0, 0, SEEK_CUR) = 46440
- _exit(0)
- */
-
- // Should probably have some more error checking here.
- // Doing it this way, also makes the inodes stay the same.
- // This is still not a very good solution, in particular we
- // might loose the owner of the backup.
- FileInfo finfo(fileName());
- if (finfo.exist()) {
- mode_t fmode = finfo.getMode();
- struct utimbuf times = {
- finfo.getAccessTime(),
- finfo.getModificationTime() };
-
- ifstream ifs(fileName().c_str());
- ofstream ofs(s.c_str(), ios::out|ios::trunc);
- if (ifs && ofs) {
- ofs << ifs.rdbuf();
- ifs.close();
- ofs.close();
- ::chmod(s.c_str(), fmode);
-
- if (::utime(s.c_str(), ×)) {
- lyxerr << "utime error." << endl;
- }
- } else {
- lyxerr << "LyX was not able to make "
- "backup copy. Beware." << endl;
- }
+ // It might very well be that this variant is just
+ // good enough. (Lgb)
+ // But to use this we need fs::copy_file to actually do a copy,
+ // even when the target file exists. (Lgb)
+ if (fs::exists(fileName())) {
+ //try {
+ fs::copy_file(fileName(), s, false);
+ //}
+ //catch (fs::filesystem_error const & fe) {
+ //lyxerr << "LyX was not able to make backup copy. Beware.\n"
+ // << fe.what() << endl;
+ //}
}
}
if (pimpl_->read_only && fname == fileName())
return false;
- FileInfo finfo(fname);
- if (finfo.exist() && !finfo.writable())
- return false;
-
bool retval = false;
if (params().compressed) {
- gz::ogzstream ofs(fname.c_str());
+#ifdef USE_COMPRESSION
+ gz::ogzstream ofs(fname.c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
retval = do_writeFile(ofs);
-
+#else
+ return false;
+#endif
} else {
- ofstream ofs(fname.c_str());
+ ofstream ofs(fname.c_str(), ios::out|ios::trunc);
if (!ofs)
return false;
{
LyXTextClass const & tclass = params().getLyXTextClass();
- if (params().tracking_changes) {
+ if (features.isAvailable("dvipost") && params().tracking_changes
+ && params().output_changes) {
features.require("dvipost");
features.require("color");
}