[libcamera-devel,v2,4/4] libcamera: file: Create the file on open() if it doesn't exist

Message ID 20200714090936.9562-4-laurent.pinchart@ideasonboard.com
State Accepted
Commit c1bbba36d39e60388d6e9e13418dedb08114f9b2
Headers show
Series
  • [libcamera-devel,v2,1/4] libcamera: file: Add read/write support
Related show

Commit Message

Laurent Pinchart July 14, 2020, 9:09 a.m. UTC
When a file is opened in WriteOnly or ReadWrite mode, create it if it
doesn't exist.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/file.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Patch

diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp
index d99a1806e1c8..04b0cb61a1bf 100644
--- a/src/libcamera/file.cpp
+++ b/src/libcamera/file.cpp
@@ -148,8 +148,9 @@  bool File::exists() const
  * \param[in] mode The open mode
  *
  * This function opens the file specified by fileName() in \a mode. If the file
- * doesn't exist and the mode is WriteOnly or ReadWrite, this
- * function will attempt to create the file.
+ * doesn't exist and the mode is WriteOnly or ReadWrite, this function will
+ * attempt to create the file with initial permissions set to 0666 (modified by
+ * the process' umask).
  *
  * The error() status is updated.
  *
@@ -163,8 +164,10 @@  bool File::open(File::OpenMode mode)
 	}
 
 	int flags = (mode & ReadWrite) - 1;
+	if (mode & WriteOnly)
+		flags |= O_CREAT;
 
-	fd_ = ::open(name_.c_str(), flags);
+	fd_ = ::open(name_.c_str(), flags, 0666);
 	if (fd_ < 0) {
 		error_ = -errno;
 		return false;