Skip to content

Commit 26ec13f

Browse files
Use own constants for permissions (#1405)
DEFFILEMODE and ACCESSPERMS may be not accessible on some platforms Relates-To: OAM-2037 Signed-off-by: Andrey Kashcheev <[email protected]>
1 parent e9906df commit 26ec13f

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

olp-cpp-sdk-core/src/cache/DiskCacheEnv.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ constexpr const int kOpenBaseFlags = 0;
4747

4848
namespace {
4949

50+
constexpr const auto kExtendedFilePermissions =
51+
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
52+
constexpr const auto kExtendedDirPermissions = S_IRWXU | S_IRWXG | S_IRWXO;
53+
5054
constexpr const size_t kWritableFileBufferSize = 65536;
5155

5256
leveldb::Status PosixError(const std::string& context, int error_number) {
@@ -530,8 +534,10 @@ class EnvWrapper : public leveldb::EnvWrapper {
530534
: leveldb::EnvWrapper(leveldb::Env::Default()),
531535
locks_(locks),
532536
fd_limiter_(fd_limiter),
533-
default_file_permissions_(extend_permissions ? DEFFILEMODE : 0644),
534-
default_dir_permissions_(extend_permissions ? ACCESSPERMS : 0755) {}
537+
default_file_permissions_(extend_permissions ? kExtendedFilePermissions
538+
: 0644),
539+
default_dir_permissions_(extend_permissions ? kExtendedDirPermissions
540+
: 0755) {}
535541

536542
~EnvWrapper() = default;
537543

@@ -657,8 +663,7 @@ class EnvWrapper : public leveldb::EnvWrapper {
657663
namespace olp {
658664
namespace cache {
659665

660-
std::shared_ptr<leveldb::Env> DiskCacheEnv::CreateEnv(
661-
bool extend_permissions) {
666+
std::shared_ptr<leveldb::Env> DiskCacheEnv::CreateEnv(bool extend_permissions) {
662667
#ifdef PORTING_PLATFORM_WINDOWS
663668
OLP_SDK_CORE_UNUSED(extend_permissions);
664669
// return the normal env as a shared ptr with empty deleter

0 commit comments

Comments
 (0)