Replace LString.h with support/std_string.h,

[features.git] / src / support / filetools.C

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 29a8858a2b6fa827ba1df2569f1d116d3915e83a..e0d333b0967be3a5b44d44926118d53ce8a4eaae 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -36,7 +36,7 @@
 #include "lyxlib.h"
 #include "os.h"
 
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 
 #include <boost/cregex.hpp>
 #include <cctype>
@@ -80,8 +80,6 @@ using std::ifstream;
 using std::vector;
 using std::getline;
 
-extern string system_lyxdir;
-extern string user_lyxdir;
 
 namespace lyx {
 namespace support {
@@ -187,8 +185,8 @@ string const FileOpenSearch(string const & path, string const & name,
                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);
 
@@ -293,7 +291,7 @@ string const FileSearch(string const & path, string const & name,
 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;
 
@@ -302,7 +300,7 @@ string const LibFileSearch(string const & dir, string const & name,
        if (!fullname.empty())
                return fullname;
 
-       return FileSearch(AddPath(system_lyxdir, dir), name, ext);
+       return FileSearch(AddPath(system_lyxdir(), dir), name, ext);
 }
 
 
@@ -466,7 +464,7 @@ string const CreateTmpDir(string const & tempdir, string const & mask)
 int destroyDir(string const & tmpdir)
 {
 #ifdef __EMX__
-       Path p(user_lyxdir);
+       Path p(user_lyxdir());
 #endif
        if (DeleteAllFilesInDir(tmpdir))
                return -1;
@@ -498,14 +496,14 @@ string const CreateLyXTmpDir(string const & deflt)
        if ((!deflt.empty()) && (deflt  != "/tmp")) {
                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");
        }
@@ -957,9 +955,9 @@ string const GetExtension(string const & name)
 //      ...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
@@ -977,13 +975,13 @@ string const getExtFromContents(string const & filename)
                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;
@@ -1136,10 +1134,18 @@ bool zippedFile(string const & name)
 }
 
 
+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 = tempName(string(), file);
+       string  const tempfile = unzippedFileName(zipped_file);
        // Run gunzip
        string const command = "gunzip -c " + zipped_file + " > " + tempfile;
        Systemcall one;
@@ -1335,43 +1341,29 @@ string const readBB_from_PSFile(string const & file)
 }
 
 
-string const copyFileToDir(string const & path, string const & file_in)
+int compare_timestamps(string const & file1, string const & file2)
 {
-       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 = 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