summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/io/qabstractfileengine.cpp8
-rw-r--r--src/corelib/io/qabstractfileengine_p.h3
-rw-r--r--src/corelib/io/qfsfileengine.cpp5
-rw-r--r--src/corelib/io/qfsfileengine_p.h12
-rw-r--r--src/corelib/io/qfsfileengine_unix.cpp14
-rw-r--r--src/corelib/io/qfsfileengine_win.cpp11
-rw-r--r--src/corelib/io/qresource.cpp5
-rw-r--r--src/corelib/io/qresource_p.h2
-rw-r--r--src/corelib/io/qtemporaryfile.cpp5
-rw-r--r--src/corelib/io/qtemporaryfile_p.h2
10 files changed, 51 insertions, 16 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp
index 063cee1071..d6b2b6a10e 100644
--- a/src/corelib/io/qabstractfileengine.cpp
+++ b/src/corelib/io/qabstractfileengine.cpp
@@ -383,10 +383,16 @@ QAbstractFileEngine::~QAbstractFileEngine()
The \a mode is an OR combination of QIODevice::OpenMode and
QIODevice::HandlingMode values.
+
+ If the file is created as a result of this call, its permissions are
+ set according to \a permissision. Null value means an implementation-
+ specific default.
*/
-bool QAbstractFileEngine::open(QIODevice::OpenMode openMode)
+bool QAbstractFileEngine::open(QIODevice::OpenMode openMode,
+ std::optional<QFile::Permissions> permissions)
{
Q_UNUSED(openMode);
+ Q_UNUSED(permissions);
return false;
}
diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h
index d8ea5c318f..9649e67029 100644
--- a/src/corelib/io/qabstractfileengine_p.h
+++ b/src/corelib/io/qabstractfileengine_p.h
@@ -124,7 +124,8 @@ public:
virtual ~QAbstractFileEngine();
- virtual bool open(QIODevice::OpenMode openMode);
+ virtual bool open(QIODevice::OpenMode openMode,
+ std::optional<QFile::Permissions> permissions = std::nullopt);
virtual bool close();
virtual bool flush();
virtual bool syncToDisk();
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index 6cd25de591..4ba35abacb 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -226,7 +226,8 @@ void QFSFileEngine::setFileName(const QString &file)
/*!
\reimp
*/
-bool QFSFileEngine::open(QIODevice::OpenMode openMode)
+bool QFSFileEngine::open(QIODevice::OpenMode openMode,
+ std::optional<QFile::Permissions> permissions)
{
Q_ASSERT_X(openMode & QIODevice::Unbuffered, "QFSFileEngine::open",
"QFSFileEngine no longer supports buffered mode; upper layer must buffer");
@@ -250,7 +251,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode)
d->fh = nullptr;
d->fd = -1;
- return d->nativeOpen(d->openMode);
+ return d->nativeOpen(d->openMode, permissions);
}
/*!
diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h
index 6cfa6ebbab..4ebba61bb6 100644
--- a/src/corelib/io/qfsfileengine_p.h
+++ b/src/corelib/io/qfsfileengine_p.h
@@ -59,6 +59,10 @@
#include <optional>
+#ifdef Q_OS_UNIX
+#include <sys/types.h> // for mode_t
+#endif
+
#ifndef QT_NO_FSFILEENGINE
QT_BEGIN_NAMESPACE
@@ -81,7 +85,7 @@ public:
explicit QFSFileEngine(const QString &file);
~QFSFileEngine();
- bool open(QIODevice::OpenMode openMode) override;
+ bool open(QIODevice::OpenMode openMode, std::optional<QFile::Permissions> permissions) override;
bool open(QIODevice::OpenMode flags, FILE *fh);
bool close() override;
bool flush() override;
@@ -156,7 +160,7 @@ public:
QFileSystemEntry fileEntry;
QIODevice::OpenMode openMode;
- bool nativeOpen(QIODevice::OpenMode openMode);
+ bool nativeOpen(QIODevice::OpenMode openMode, std::optional<QFile::Permissions> permissions);
bool openFh(QIODevice::OpenMode flags, FILE *fh);
bool openFd(QIODevice::OpenMode flags, int fd);
bool nativeClose();
@@ -246,6 +250,10 @@ protected:
void init();
QAbstractFileEngine::FileFlags getPermissions(QAbstractFileEngine::FileFlags type) const;
+
+#ifdef Q_OS_UNIX
+ bool nativeOpenImpl(QIODevice::OpenMode openMode, mode_t mode);
+#endif
};
QT_END_NAMESPACE
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 5815d6bc9c..d071c85cb3 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -39,6 +39,7 @@
#include "qplatformdefs.h"
#include "private/qabstractfileengine_p.h"
+#include "private/qfiledevice_p.h"
#include "private/qfsfileengine_p.h"
#include "private/qcore_unix_p.h"
#include "qfilesystementry_p.h"
@@ -107,7 +108,16 @@ static inline QString msgOpenDirectory()
/*!
\internal
*/
-bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
+bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode,
+ std::optional<QFile::Permissions> permissions)
+{
+ return nativeOpenImpl(openMode, permissions ? QtPrivate::toMode_t(*permissions) : 0666);
+}
+
+/*!
+ \internal
+*/
+bool QFSFileEnginePrivate::nativeOpenImpl(QIODevice::OpenMode openMode, mode_t mode)
{
Q_Q(QFSFileEngine);
@@ -118,7 +128,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
// Try to open the file in unbuffered mode.
do {
- fd = QT_OPEN(fileEntry.nativeFilePath().constData(), flags, 0666);
+ fd = QT_OPEN(fileEntry.nativeFilePath().constData(), flags, mode);
} while (fd == -1 && errno == EINTR);
// On failure, return and report the error.
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
index 394b4ab69e..60e25d34f1 100644
--- a/src/corelib/io/qfsfileengine_win.cpp
+++ b/src/corelib/io/qfsfileengine_win.cpp
@@ -39,6 +39,7 @@
#include "qplatformdefs.h"
#include "private/qabstractfileengine_p.h"
+#include "private/qfiledevice_p.h"
#include "private/qfsfileengine_p.h"
#include "qfilesystemengine_p.h"
#include <qdebug.h>
@@ -95,7 +96,8 @@ QString QFSFileEnginePrivate::longFileName(const QString &path)
/*
\internal
*/
-bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
+bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode,
+ std::optional<QFile::Permissions> permissions)
{
Q_Q(QFSFileEngine);
@@ -115,11 +117,14 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
? OPEN_ALWAYS
: OPEN_EXISTING;
// Create the file handle.
- SECURITY_ATTRIBUTES securityAtts = { sizeof(SECURITY_ATTRIBUTES), NULL, FALSE };
+ QNativeFilePermissions nativePermissions(permissions, false);
+ if (!nativePermissions.isOk())
+ return false;
+
fileHandle = CreateFile((const wchar_t*)fileEntry.nativeFilePath().utf16(),
accessRights,
shareMode,
- &securityAtts,
+ nativePermissions.securityAttributes(),
creationDisp,
FILE_ATTRIBUTE_NORMAL,
NULL);
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 8f0440ef2e..af0b9429af 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -1409,8 +1409,11 @@ void QResourceFileEngine::setFileName(const QString &file)
d->resource.setFileName(file);
}
-bool QResourceFileEngine::open(QIODevice::OpenMode flags)
+bool QResourceFileEngine::open(QIODevice::OpenMode flags,
+ std::optional<QFile::Permissions> permissions)
{
+ Q_UNUSED(permissions);
+
Q_D(QResourceFileEngine);
if (d->resource.fileName().isEmpty()) {
qWarning("QResourceFileEngine::open: Missing file name");
diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h
index 31753b9a4f..19db6b24cd 100644
--- a/src/corelib/io/qresource_p.h
+++ b/src/corelib/io/qresource_p.h
@@ -66,7 +66,7 @@ public:
void setFileName(const QString &file) override;
- bool open(QIODevice::OpenMode flags) override;
+ bool open(QIODevice::OpenMode flags, std::optional<QFile::Permissions> permissions) override;
bool close() override;
bool flush() override;
qint64 size() const override;
diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp
index 5ccb959288..4b587857a8 100644
--- a/src/corelib/io/qtemporaryfile.cpp
+++ b/src/corelib/io/qtemporaryfile.cpp
@@ -340,7 +340,8 @@ void QTemporaryFileEngine::setFileName(const QString &file)
QFSFileEngine::setFileName(file);
}
-bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)
+bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode,
+ std::optional<QFile::Permissions> permissions)
{
Q_D(QFSFileEngine);
Q_ASSERT(!isReallyOpen());
@@ -348,7 +349,7 @@ bool QTemporaryFileEngine::open(QIODevice::OpenMode openMode)
openMode |= QIODevice::ReadWrite;
if (!filePathIsTemplate)
- return QFSFileEngine::open(openMode);
+ return QFSFileEngine::open(openMode, permissions);
QTemporaryFileName tfn(templateName);
diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
index 6bcff936b4..ac9c239d21 100644
--- a/src/corelib/io/qtemporaryfile_p.h
+++ b/src/corelib/io/qtemporaryfile_p.h
@@ -133,7 +133,7 @@ public:
bool isReallyOpen() const;
void setFileName(const QString &file) override;
- bool open(QIODevice::OpenMode flags) override;
+ bool open(QIODevice::OpenMode flags, std::optional<QFile::Permissions> permissions) override;
bool remove() override;
bool rename(const QString &newName) override;
bool renameOverwrite(const QString &newName) override;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 22:59:15 +0000