Remove executable status info from typeIndicator.

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

diff --git a/src/support/os_os2.C b/src/support/os_os2.C
index 495a19e5ea00091f2bd934a3f60dad9e85082515..ac4b33e98f9d59e3d723d0490ddd957bcaf91b24 100644 (file)
--- a/src/support/os_os2.C
+++ b/src/support/os_os2.C
@@ -30,6 +30,9 @@ namespace {
 string binpath_;
 string binname_;
 string tmpdir_;
+string homepath_;
+string nulldev_;
+
 os::shell_type shell_ = os::UNIX;
 unsigned long cp_ = 0;
 
@@ -53,7 +56,7 @@ void init(int argc, char * argv[])
        if (rc != NO_ERROR)
                exit(rc);
        string p = tmp.get();
-       p = slashify_path(p);
+       p = internal_path(p);
        binname_ = OnlyFilename(p);
        binname_.erase(binname_.length()-4, string::npos);
        binpath_ = OnlyPath(p);
@@ -86,6 +89,10 @@ void init(int argc, char * argv[])
        // CPList[1] == system default codepage, the rest are auxilary.
        // Once cp_ is correctly set, you can call other routines.
        cp_ = CPList[1];
+
+       tmpdir_ = "/tmp";
+       homepath_ = GetEnvPath("HOME");
+       nulldev_ = "null";
 }
 
 
@@ -121,8 +128,8 @@ string::size_type common_path(string const & p1, string const & p2)
        COUNTRYCODE cntry;
        cntry.country = 0;
        cntry.codepage = cp_;
-       string temp1 = slashify_path(p1);
-       string temp2 = slashify_path(p2);
+       string temp1 = internal_path(p1);
+       string temp2 = internal_path(p2);
        char * tmp1 = const_cast<char *> (temp1.c_str());
        char * tmp2 = const_cast<char *> (temp2.c_str());
        /* rc = */ DosMapCase(p1.length(), &cntry, tmp1);
@@ -150,7 +157,7 @@ string::size_type common_path(string const & p1, string const & p2)
 }
 
 
-string slashify_path(string const & p)
+string internal_path(string const & p)
 {
        static bool initialized = false;
        static bool leadbyte[256] = {false};
@@ -195,12 +202,6 @@ string external_path(string const & p)
 }
 
 
-string internal_path(string const & p)
-{
-       return p;
-}
-
-
 bool is_absolute_path(string const & p)
 {
        return (p.length() > 1
@@ -217,13 +218,13 @@ char const * popen_read_mode()
 }
 
 
-string binpath()
+string const & binpath()
 {
        return binpath_;
 }
 
 
-string binname()
+string const & binname()
 {
        return binname_;
 }
@@ -235,12 +236,24 @@ void setTmpDir(string const & p)
 }
 
 
-string getTmpDir()
+string const & getTmpDir()
 {
        return tmpdir_;
 }
 
 
+string const & homepath()
+{
+       return homepath_;
+}
+
+
+string const & nulldev()
+{
+       return nulldev_;
+}
+
+
 shell_type shell()
 {
        return shell_;