File missing in the tarball

[lyx.git] / src / support / filetools.cpp

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 48ba7ef785ba00463e1df7126883a0fac3abf780..82854612a00f512c2840f70206fd72994676a400 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -55,19 +55,19 @@ using namespace std;
 namespace lyx {
 namespace support {
 
-bool isLyXFilename(string const & filename)
+bool isLyXFileName(string const & filename)
 {
        return suffixIs(ascii_lowercase(filename), ".lyx");
 }
 
 
-bool isSGMLFilename(string const & filename)
+bool isSGMLFileName(string const & filename)
 {
        return suffixIs(ascii_lowercase(filename), ".sgml");
 }
 
 
-bool isValidLaTeXFilename(string const & filename)
+bool isValidLaTeXFileName(string const & filename)
 {
        string const invalid_chars("#$%{}()[]\"^");
        return filename.find_first_of(invalid_chars) == string::npos;
@@ -107,7 +107,7 @@ string const latex_path(string const & original_path,
 FileName const makeLatexName(FileName const & file)
 {
        string name = file.onlyFileName();
-       string const path = file.onlyPath().absFilename() + "/";
+       string const path = file.onlyPath().absFileName() + "/";
 
        // ok so we scan through the string twice, but who cares.
        // FIXME: in Unicode time this will break for sure! There is
@@ -179,9 +179,9 @@ FileName const fileOpenSearch(string const & path, string const & name,
                if (!suffixIs(path_element, '/'))
                        path_element += '/';
                path_element = subst(path_element, "$$LyX",
-                                    package().system_support().absFilename());
+                                    package().system_support().absFileName());
                path_element = subst(path_element, "$$User",
-                                    package().user_support().absFilename());
+                                    package().user_support().absFileName());
 
                real_file = fileSearch(path_element, name, ext);
 
@@ -215,8 +215,8 @@ FileName const fileSearch(string const & path, string const & name,
                return mode == may_not_exist ? fullname : FileName();
        // Only add the extension if it is not already the extension of
        // fullname.
-       if (getExtension(fullname.absFilename()) != ext)
-               fullname = FileName(addExtension(fullname.absFilename(), ext));
+       if (getExtension(fullname.absFileName()) != ext)
+               fullname = FileName(addExtension(fullname.absFileName(), ext));
        if (fullname.isReadableFile() || mode == may_not_exist)
                return fullname;
        return FileName();
@@ -230,18 +230,18 @@ FileName const fileSearch(string const & path, string const & name,
 FileName const libFileSearch(string const & dir, string const & name,
                           string const & ext)
 {
-       FileName fullname = fileSearch(addPath(package().user_support().absFilename(), dir),
+       FileName fullname = fileSearch(addPath(package().user_support().absFileName(), dir),
                                     name, ext);
        if (!fullname.empty())
                return fullname;
 
        if (!package().build_support().empty())
-               fullname = fileSearch(addPath(package().build_support().absFilename(), dir),
+               fullname = fileSearch(addPath(package().build_support().absFileName(), dir),
                                      name, ext);
        if (!fullname.empty())
                return fullname;
 
-       return fileSearch(addPath(package().system_support().absFilename(), dir), name, ext);
+       return fileSearch(addPath(package().system_support().absFileName(), dir), name, ext);
 }
 
 
@@ -313,7 +313,7 @@ string const libScriptSearch(string const & command_in, quote_style style)
 
        // Does this script file exist?
        string const script =
-               libFileSearch(".", command.substr(start_script, size_script)).absFilename();
+               libFileSearch(".", command.substr(start_script, size_script)).absFileName();
 
        if (script.empty()) {
                // Replace "$$s/" with ""
@@ -401,7 +401,7 @@ FileName const makeAbsPath(string const & relPath, string const & basePath)
        if (FileName::isAbsolute(basePath))
                tempBase = basePath;
        else
-               tempBase = addPath(FileName::getcwd().absFilename(), basePath);
+               tempBase = addPath(FileName::getcwd().absFileName(), basePath);
 
        // Handle /./ at the end of the path
        while (suffixIs(tempBase, "/./"))
@@ -415,7 +415,7 @@ FileName const makeAbsPath(string const & relPath, string const & basePath)
        // Split by first /
        rTemp = split(rTemp, temp, '/');
        if (temp == "~") {
-               tempBase = package().home_dir().absFilename();
+               tempBase = package().home_dir().absFileName();
                tempRel = rTemp;
        }
 
@@ -464,7 +464,7 @@ FileName const makeAbsPath(string const & relPath, string const & basePath)
 // Chops any path of filename.
 string const addName(string const & path, string const & fname)
 {
-       string const basename = onlyFilename(fname);
+       string const basename = onlyFileName(fname);
        string buf;
 
        if (path != "." && path != "./" && !path.empty()) {
@@ -478,7 +478,7 @@ string const addName(string const & path, string const & fname)
 
 
 // Strips path from filename
-string const onlyFilename(string const & fname)
+string const onlyFileName(string const & fname)
 {
        if (fname.empty())
                return fname;
@@ -508,13 +508,13 @@ string const expandPath(string const & path)
        rTemp = split(rTemp, temp, '/');
 
        if (temp == ".")
-               return FileName::getcwd().absFilename() + '/' + rTemp;
+               return FileName::getcwd().absFileName() + '/' + rTemp;
 
        if (temp == "~")
-               return package().home_dir().absFilename() + '/' + rTemp;
+               return package().home_dir().absFileName() + '/' + rTemp;
 
        if (temp == "..")
-               return makeAbsPath(copy).absFilename();
+               return makeAbsPath(copy).absFileName();
 
        // Don't know how to handle this
        return copy;
@@ -675,7 +675,7 @@ 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 onlyPath(zipped_file) + "unzipped_" + onlyFilename(zipped_file);
+       return onlyPath(zipped_file) + "unzipped_" + onlyFileName(zipped_file);
 }
 
 
@@ -701,12 +701,12 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
        string str = path;
 
        // If file is from LyXDir, display it as if it were relative.
-       string const system = package().system_support().absFilename();
+       string const system = package().system_support().absFileName();
        if (prefixIs(str, system) && str != system)
                return from_utf8("[" + str.erase(0, system.length()) + "]");
 
        // replace /home/blah with ~/
-       string const home = package().home_dir().absFilename();
+       string const home = package().home_dir().absFileName();
        if (!home.empty() && prefixIs(str, home))
                str = subst(str, home, "~");
 
@@ -723,7 +723,7 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
        if (str.empty()) {
                // Yes, filename itself is too long.
                // Pick the start and the end of the filename.
-               str = onlyFilename(path);
+               str = onlyFileName(path);
                string const head = str.substr(0, threshold / 2 - 3);
 
                string::size_type len = str.length();
@@ -739,15 +739,14 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
 bool readLink(FileName const & file, FileName & link)
 {
 #ifdef HAVE_READLINK
-       char linkbuffer[512];
-       // Should be PATH_MAX but that needs autconf support
+       char linkbuffer[PATH_MAX + 1];
        string const encoded = file.toFilesystemEncoding();
        int const nRead = ::readlink(encoded.c_str(),
                                     linkbuffer, sizeof(linkbuffer) - 1);
        if (nRead <= 0)
                return false;
        linkbuffer[nRead] = '\0'; // terminator
-       link = makeAbsPath(linkbuffer, onlyPath(file.absFilename()));
+       link = makeAbsPath(linkbuffer, onlyPath(file.absFileName()));
        return true;
 #else
        return false;