mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 904e5801ae.
We don't use linkoo and SAL_ALLOW_LINKOO_SYMLINKS anymore.

Conflicts:
	sal/osl/unx/file_url.cxx

Change-Id: I1a0211295afef79f72356677d9b3bc6c5211d496
This commit is contained in:
Matúš Kukan
2013-09-17 18:57:52 +02:00
parent 9759bbde89
commit b900b6ed25
1 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sal/osl/unx/file_url.cxx
View File

@@ -624,37 +624,7 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString* ustrBaseDirURL, rtl_uString* u
} }
rtl::OUString resolved_path; rtl::OUString resolved_path;
rc = (FileBase::RC) osl_getAbsoluteFileURL_impl_(unresolved_path, 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;
}
}
if (FileBase::E_None == rc) if (FileBase::E_None == rc)
{ {
rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL); rc = (FileBase::RC) osl_getFileURLFromSystemPath(resolved_path.pData, pustrAbsoluteURL);