tostr -> convert and some bformat work

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

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 78149fa4c57020d2c16bb47073b5435e8694cb3c..4b29034661b3e84e5c6df4810061214b1299bf4c 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -185,7 +185,7 @@ string const FileOpenSearch(string const & path, string const & name,
        string tmppath = split(path, path_element, ';');
 
        while (notfound && !path_element.empty()) {
-               path_element = os::slashify_path(path_element);
+               path_element = os::internal_path(path_element);
                if (!suffixIs(path_element, '/'))
                        path_element+= '/';
                path_element = subst(path_element, "$$LyX", system_lyxdir());
@@ -394,7 +394,7 @@ string const GetEnvPath(string const & name)
 #ifndef __EMX__
        string const pathlist = subst(GetEnv(name), ':', ';');
 #else
-       string const pathlist = os::slashify_path(GetEnv(name));
+       string const pathlist = os::internal_path(GetEnv(name));
 #endif
        return rtrim(pathlist, ";");
 }
@@ -497,7 +497,7 @@ string const createBufferTmpDir()
        // We are in our own directory.  Why bother to mangle name?
        // In fact I wrote this code to circumvent a problematic behaviour (bug?)
        // of EMX mkstemp().
-       string const tmpfl = os::getTmpDir() + "/lyx_tmpbuf" + tostr(count++);
+       string const tmpfl = os::getTmpDir() + "/lyx_tmpbuf" + convert<string>(count++);
        if (mkdir(tmpfl, 0777)) {
                lyxerr << "LyX could not create the temporary directory '"
                       << tmpfl << "'" << endl;
@@ -538,7 +538,7 @@ string const createLyXTmpDir(string const & deflt)
 
 bool createDirectory(string const & path, int permission)
 {
-       string temp(rtrim(os::slashify_path(path), "/"));
+       string temp(rtrim(os::internal_path(path), "/"));
 
        BOOST_ASSERT(!temp.empty());
 
@@ -573,7 +573,7 @@ string const MakeAbsPath(string const & RelPath, string const & BasePath)
                return RelPath;
 
        // Copies given paths
-       string TempRel(os::slashify_path(RelPath));
+       string TempRel(os::internal_path(RelPath));
        // Since TempRel is NOT absolute, we can safely replace "//" with "/"
        TempRel = subst(TempRel, "//", "/");
 
@@ -624,7 +624,7 @@ string const MakeAbsPath(string const & RelPath, string const & BasePath)
        }
 
        // returns absolute path
-       return os::slashify_path(TempBase);
+       return os::internal_path(TempBase);
 }
 
 
@@ -639,7 +639,7 @@ string const AddName(string const & path, string const & fname)
        string buf;
 
        if (path != "." && path != "./" && !path.empty()) {
-               buf = os::slashify_path(path);
+               buf = os::internal_path(path);
                if (!suffixIs(path, '/'))
                        buf += '/';
        }
@@ -840,10 +840,10 @@ string const MakeRelPath(string const & abspath, string const & basepath)
 string const AddPath(string const & path, string const & path_2)
 {
        string buf;
-       string const path2 = os::slashify_path(path_2);
+       string const path2 = os::internal_path(path_2);
 
        if (!path.empty() && path != "." && path != "./") {
-               buf = os::slashify_path(path);
+               buf = os::internal_path(path);
                if (path[path.length() - 1] != '/')
                        buf += '/';
        }
@@ -877,7 +877,7 @@ string const ChangeExtension(string const & oldname, string const & extension)
        else
                ext = extension;
 
-       return os::slashify_path(oldname.substr(0, last_dot) + ext);
+       return os::internal_path(oldname.substr(0, last_dot) + ext);
 }
 
 
@@ -1145,6 +1145,7 @@ string const MakeDisplayPath(string const & path, unsigned int threshold)
 
 bool LyXReadLink(string const & file, string & link, bool resolve)
 {
+#ifdef HAVE_READLINK
        char linkbuffer[512];
        // Should be PATH_MAX but that needs autconf support
        int const nRead = ::readlink(file.c_str(),
@@ -1157,6 +1158,9 @@ bool LyXReadLink(string const & file, string & link, bool resolve)
        else
                link = linkbuffer;
        return true;
+#else
+       return false;
+#endif
 }