Revert "fix-linkoo.diff: Fix linkoo to work again."

This reverts commit 904e5801aea86a79d6256fcbc3cfdba4535ca8a9.
We don't use linkoo and SAL_ALLOW_LINKOO_SYMLINKS anymore.

Conflicts:
	sal/osl/unx/file_url.cxx

Change-Id: I1a0211295afef79f72356677d9b3bc6c5211d496

1 files changed, 1 insertions, 31 deletions

diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 14002164f173..5a1dd2b4d0c2 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -624,37 +624,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString*  ustrBaseDirURL, rtl_uString* u
     }
 
     rtl::OUString resolved_path;
-
-    static bool allow_symlinks = getenv("SAL_ALLOW_LINKOO_SYMLINKS") != 0;
-        // getenv is not thread safe, so minimize use of result
-    if (!allow_symlinks)
-    {
-        rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
-    }
-    else
-    {
-        // SAL_ALLOW_LINKOO_SYMLINKS environment variable:
-        // for linkoo to work, we need to let the symlinks to the libraries untouched
-        rtl::OUString base;
-        sal_Int32 last_slash = unresolved_path.lastIndexOf( '/' );
-
-        if (last_slash >= 0 && last_slash + 1 < unresolved_path.getLength()
-            && ! ( last_slash + 2 == unresolved_path.getLength() && unresolved_path.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("."), last_slash + 1) )
-            && ! ( last_slash + 3 == unresolved_path.getLength() && unresolved_path.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(".."), last_slash + 1) ))
-        {
-            base = unresolved_path.copy(last_slash+1);
-            unresolved_path = unresolved_path.copy(0, last_slash);
-        }
-
-        rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
-
-        if (!base.isEmpty())
-        {
-            resolved_path += "/";
-            resolved_path += base;
-        }
-    }
-
+    rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, resolved_path);
     if (FileBase::E_None == rc)
     {
         rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL);