summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-16 01:31:52 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commit327a45d82e4c9336b519f596dfa0899165998099 (patch)
treee0008dd844456d80f146c0bcbeb64f852c113fbe /sal
parentbac11dce543410a216a26a0415ddb77878687474 (diff)
Bypass the O_NONBLOCK resetting for now when sandboxed on OS X
The fcntl fails. Will have to check later whether we should also drop using O_NONBLOCK when opening then. Change-Id: I529a4d728563eb323e35487782f7fee88b2faa0c
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/file.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 4e646b09614b..279b3211c895 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include "osl/file.hxx"
#include "osl/detail/file.h"
@@ -929,6 +930,7 @@ SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_u
return oslTranslateFileError (OSL_FET_ERROR, saved_errno);
}
+#if !HAVE_FEATURE_MACOSX_SANDBOX
/* reset O_NONBLOCK flag */
if (flags & O_NONBLOCK)
{
@@ -958,7 +960,7 @@ SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle, sal_u
return eRet;
}
}
-
+#endif
/* get file status (mode, size) */
struct stat aFileStat;
if (-1 == fstat (fd, &aFileStat))