ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#128538: Open filesystem directories in Finder after all

Browse Source 
Where option "-R" means, according to the open(1) man page: "Reveals the file(s)
in the Finder instead of opening them."  This appears to always reveal in
Finder, even for *.app "application directories", so should not affect
CVE-2019-9847.)

Change-Id: I775db7bf71c09adc6570931a977b82dfee8dc95a
Reviewed-on: https://gerrit.libreoffice.org/82749
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-11-15 09:44:28 +01:00
parent b58b78f527
commit 1ff1466b05
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/source/unix/exec/shellexec.cxx
+10 -3
View File
@@ -117,6 +117,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
}
#ifdef MACOSX
bool dir = false;
if (uri->getScheme().equalsIgnoreAsciiCase("file")) {
OUString pathname;
auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, pathname);
@@ -142,8 +143,10 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
auto const e3 = errno;
SAL_INFO("shell", "stat(" << pathname8 << ") failed with errno " << e3);
}
if (e2 != 0 || !S_ISREG(st.st_mode)
|| (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)
if (e2 == 0 && S_ISDIR(st.st_mode)) {
dir = true;
} else if (e2 != 0 || !S_ISREG(st.st_mode)
|| (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0)
{
throw css::lang::IllegalArgumentException(
"XSystemShellExecute.execute, cannot process <" + aCommand + ">", {}, 0);
@@ -172,7 +175,11 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
// 2.4 If it does not match an exitsting pathname (relative to CWD):
// Results in "The file /.../foo:bar does not exits." (where "/..." is
// the CWD) on stderr and SystemShellExecuteException.
aBuffer.append("open --");
aBuffer.append("open");
if (dir) {
aBuffer.append(" -R");
}
aBuffer.append(" --");
#else
// Just use xdg-open on non-Mac
aBuffer.append("/usr/bin/xdg-open");