correct use of NSNumber constructor for NSTimeInterval;remove superfluous semicolons...

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

diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 521d77ec9b5e5000f687c61f099f5cabebf6b9b9..2e8e10f94db5b4a9c24a1a6b3f90ea7cbd156d0d 100644 (file)
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -74,7 +74,14 @@ bool isSGMLFileName(string const & filename)
 
 bool isValidLaTeXFileName(string const & filename)
 {
-       string const invalid_chars("#$%{}()[]\"^");
+       string const invalid_chars("#%\"");
+       return filename.find_first_of(invalid_chars) == string::npos;
+}
+
+
+bool isValidDVIFileName(string const & filename)
+{
+       string const invalid_chars("${}()[]^");
        return filename.find_first_of(invalid_chars) == string::npos;
 }
 
@@ -261,7 +268,7 @@ FileName const i18nLibFileSearch(string const & dir, string const & name,
           each po file is able to tell us its name. (JMarc)
        */
 
-       string lang = to_ascii(_("[[Replace with the code of your language]]"));
+       string lang = to_ascii(_(languageTestString()));
        string const language = getEnv("LANGUAGE");
        if (!lang.empty() && !language.empty())
                lang = language;
@@ -741,9 +748,9 @@ docstring const makeDisplayPath(string const & path, unsigned int threshold)
 }
 
 
+#ifdef HAVE_READLINK
 bool readLink(FileName const & file, FileName & link)
 {
-#ifdef HAVE_READLINK
        char linkbuffer[PATH_MAX + 1];
        string const encoded = file.toFilesystemEncoding();
        int const nRead = ::readlink(encoded.c_str(),
@@ -753,10 +760,13 @@ bool readLink(FileName const & file, FileName & link)
        linkbuffer[nRead] = '\0'; // terminator
        link = makeAbsPath(linkbuffer, onlyPath(file.absFileName()));
        return true;
+}
 #else
+bool readLink(FileName const &, FileName &)
+{
        return false;
-#endif
 }
+#endif
 
 
 cmd_ret const runCommand(string const & cmd)