#include "filetools.h"
#include "lstrings.h"
#include "FileInfo.h"
-#include "support/path.h" // I know it's OS/2 specific (SMiyata)
+#include "path.h"
+#include "path_defines.h"
#include "gettext.h"
#include "lyxlib.h"
#include "os.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
#include <boost/cregex.hpp>
#include <cctype>
using std::vector;
using std::getline;
-extern string system_lyxdir;
-extern string build_lyxdir;
-extern string user_lyxdir;
+namespace lyx {
+namespace support {
bool IsLyXFilename(string const & filename)
{
{
lyxerr[Debug::FILES] << "IsDirWriteable: " << path << endl;
- string const tmpfl(lyx::tempName(path, "lyxwritetest"));
+ string const tmpfl(tempName(path, "lyxwritetest"));
if (tmpfl.empty())
return false;
- lyx::unlink(tmpfl);
+ unlink(tmpfl);
return true;
}
path_element = os::slashify_path(path_element);
if (!suffixIs(path_element, '/'))
path_element+= '/';
- path_element = subst(path_element, "$$LyX", system_lyxdir);
- path_element = subst(path_element, "$$User", user_lyxdir);
+ path_element = subst(path_element, "$$LyX", system_lyxdir());
+ path_element = subst(path_element, "$$User", user_lyxdir());
real_file = FileSearch(path_element, name, ext);
string const LibFileSearch(string const & dir, string const & name,
string const & ext)
{
- string fullname = FileSearch(AddPath(user_lyxdir, dir), name, ext);
+ string fullname = FileSearch(AddPath(user_lyxdir(), dir), name, ext);
if (!fullname.empty())
return fullname;
- if (!build_lyxdir.empty())
- fullname = FileSearch(AddPath(build_lyxdir, dir), name, ext);
+ if (!build_lyxdir().empty())
+ fullname = FileSearch(AddPath(build_lyxdir(), dir), name, ext);
if (!fullname.empty())
return fullname;
- return FileSearch(AddPath(system_lyxdir, dir), name, ext);
+ return FileSearch(AddPath(system_lyxdir(), dir), name, ext);
}
FileInfo fi(unlinkpath);
if (fi.isOK() && fi.isDir())
deleted = (DeleteAllFilesInDir(unlinkpath) == 0);
- deleted &= (lyx::unlink(unlinkpath) == 0);
+ deleted &= (unlink(unlinkpath) == 0);
if (!deleted)
return_value = -1;
}
<< "CreateTmpDir: tempdir=`" << tempdir << "'\n"
<< "CreateTmpDir: mask=`" << mask << '\'' << endl;
- string const tmpfl(lyx::tempName(tempdir, mask));
+ string const tmpfl(tempName(tempdir, mask));
// lyx::tempName actually creates a file to make sure that it
// stays unique. So we have to delete it before we can create
// a dir with the same name. Note also that we are not thread
// safe because of the gap between unlink and mkdir. (Lgb)
- lyx::unlink(tmpfl.c_str());
+ unlink(tmpfl);
- if (tmpfl.empty() || lyx::mkdir(tmpfl, 0700))
+ if (tmpfl.empty() || mkdir(tmpfl, 0700))
return string();
return MakeAbsPath(tmpfl);
int destroyDir(string const & tmpdir)
{
#ifdef __EMX__
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
#endif
if (DeleteAllFilesInDir(tmpdir))
return -1;
- if (lyx::rmdir(tmpdir))
+ if (rmdir(tmpdir))
return -1;
return 0;
// In fact I wrote this code to circumvent a problematic behaviour (bug?)
// of EMX mkstemp().
string const tmpfl = tmpdir + "/lyx_tmpbuf" + tostr(count++);
- if (lyx::mkdir(tmpfl, 0777)) {
+ if (mkdir(tmpfl, 0777)) {
return string();
}
return tmpfl;
string const CreateLyXTmpDir(string const & deflt)
{
if ((!deflt.empty()) && (deflt != "/tmp")) {
- if (lyx::mkdir(deflt, 0777)) {
+ if (mkdir(deflt, 0777)) {
#ifdef __EMX__
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
#endif
return CreateTmpDir(deflt, "lyx_tmpdir");
} else
return deflt;
} else {
#ifdef __EMX__
- Path p(user_lyxdir);
+ Path p(user_lyxdir());
#endif
return CreateTmpDir("/tmp", "lyx_tmpdir");
}
{
string temp(rtrim(os::slashify_path(path), "/"));
- lyx::Assert(!temp.empty());
+ Assert(!temp.empty());
- if (lyx::mkdir(temp, permission))
+ if (mkdir(temp, permission))
return false;
return true;
if (os::is_absolute_path(BasePath))
TempBase = BasePath;
else
- TempBase = AddPath(lyx::getcwd(), BasePath);
+ TempBase = AddPath(getcwd(), BasePath);
// Handle /./ at the end of the path
while (suffixIs(TempBase, "/./"))
RTemp = split(RTemp, Temp, '/');
if (Temp == ".") {
- return lyx::getcwd() /*GetCWD()*/ + '/' + RTemp;
+ return getcwd() + '/' + RTemp;
}
if (Temp == "~") {
return GetEnvPath("HOME") + '/' + RTemp;
// ...static char *...
// XWD \000\000\000\151 (0x00006900) decimal 105
//
-// GZIP \037\213\010\010... http://www.ietf.org/rfc/rfc1952.txt
+// GZIP \037\213 http://www.ietf.org/rfc/rfc1952.txt
// ZIP PK... http://www.halyava.ru/document/ind_arch.htm
-// Z \037\177 UNIX compress
+// Z \037\235 UNIX compress
/// return the "extension" which belongs to the contents.
/// for no knowing contents return the extension. Without
return string();
// gnuzip
- string const gzipStamp = "\037\213\010\010";
+ string const gzipStamp = "\037\213";
// PKZIP
string const zipStamp = "PK";
// compress
- string const compressStamp = "\037\177";
+ string const compressStamp = "\037\235";
// Maximum strings to read
int const max_count = 50;
}
+string const unzippedFileName(string const & zipped_file)
+{
+ string const ext = GetExtension(zipped_file);
+ if (ext == "gz" || ext == "z" || ext == "Z")
+ return ChangeExtension(zipped_file, string());
+ return "unzipped_" + zipped_file;
+}
+
+
string const unzipFile(string const & zipped_file)
{
- string const file = ChangeExtension(zipped_file, string());
- string const tempfile = lyx::tempName(string(), file);
+ string const tempfile = unzippedFileName(zipped_file);
// Run gunzip
string const command = "gunzip -c " + zipped_file + " > " + tempfile;
Systemcall one;
a += '#';
FileInfo const fileinfo(a);
if (fileinfo.exist())
- lyx::unlink(a);
+ unlink(a);
}
{
lyxerr[Debug::GRAPHICS] << "[readBB_from_PSFile] "
<< message << std::endl;
+#warning Why is this func deleting a file? (Lgb)
if (zipped)
- lyx::unlink(file);
+ unlink(file);
}
}
-string const copyFileToDir(string const & path, string const & file_in)
+int compare_timestamps(string const & file1, string const & file2)
{
- lyx::Assert(AbsolutePath(path));
-
- // First, make the file path relative to path.
- string file_out = MakeRelPath(path, NormalizePath(file_in));
- file_out = os::slashify_path(file_out);
-
- // Now generate a unique filename.
- // Remove the extension.
- file_out = ChangeExtension(file_out, string());
- // Replace '/' in the file name with '_'
- file_out = subst(file_out, "/", "_");
- // Replace '.' in the file name with '_'
- file_out = subst(file_out, ".", "_");
- // Append a unique ID
- static int id;
- file_out += '_' + tostr(id++);
- // Add the extension back on
- file_out = ChangeExtension(file_out, GetExtension(file_in));
- // Put this file in the buffer's temp dir
- file_out = MakeAbsPath(file_out, path);
+ Assert(AbsolutePath(file1) && AbsolutePath(file2));
// If the original is newer than the copy, then copy the original
// to the new directory.
- FileInfo fi(file_in);
- FileInfo fi2(file_out);
-
- bool success = true;
- if (fi.exist()) {
- if (!fi2.exist() ||
- difftime(fi.getModificationTime(),
- fi2.getModificationTime()) >= 0)
- success = lyx::copy(file_in, file_out);
+ FileInfo f1(file1);
+ FileInfo f2(file2);
+
+ int cmp = 0;
+ if (f1.exist() && f2.exist()) {
+ double const tmp = difftime(f1.getModificationTime(),
+ f2.getModificationTime());
+ if (tmp != 0)
+ cmp = tmp > 0 ? 1 : -1;
+
+ } else if (f1.exist()) {
+ cmp = 1;
+ } else if (f2.exist()) {
+ cmp = -1;
}
- return success ? file_out : string();
+ return cmp;
}
+
+} //namespace support
+} // namespace lyx
projects / features.git / blobdiff