From 5e8f8549af85eeb81fc2b076b5f1a4e7d783f5ee Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 30 Nov 2015 12:50:56 +0100 Subject: [PATCH] Core/Posix: Fix file opening in ReadWrite mode Former-commit-id: 7c4a5d3e31e9449fa3c23cfad58523ed54b7834a --- src/Nazara/Core/Posix/FileImpl.cpp | 32 ++++++++++-------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp index d0d0bf7ee..ddd8d4253 100644 --- a/src/Nazara/Core/Posix/FileImpl.cpp +++ b/src/Nazara/Core/Posix/FileImpl.cpp @@ -18,8 +18,8 @@ namespace Nz void FileImpl::Close() { - if (m_fileDescriptor != -1) - close(m_fileDescriptor); + if (m_fileDescriptor != -1) + close(m_fileDescriptor); } bool FileImpl::EndOfFile() const @@ -54,30 +54,20 @@ namespace Nz int flags; mode_t permissions = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; - if (mode & OpenMode_ReadOnly) - flags = O_RDONLY; - else if (mode & OpenMode_ReadWrite) - { + if (mode & OpenMode_ReadWrite) flags = O_CREAT | O_RDWR; - - if (mode & OpenMode_Append) - flags |= O_APPEND; - - if (mode & OpenMode_Truncate) - flags |= O_TRUNC; - } + else if (mode & OpenMode_ReadOnly) + flags = O_RDONLY; else if (mode & OpenMode_WriteOnly) - { flags = O_CREAT | O_WRONLY; - - if (mode & OpenMode_Append) - flags |= O_APPEND; - - if (mode & OpenMode_Truncate) - flags |= O_TRUNC; - } else return false; + + if (mode & OpenMode_Append) + flags |= O_APPEND; + + if (mode & OpenMode_Truncate) + flags |= O_TRUNC; ///TODO: lock // if ((mode & OpenMode_Lock) == 0)