echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move file/dir permissions code to common file.

Browse Source
This commit is contained in:
Domen Vrankar 2017-11-02 21:42:18 +01:00
parent deeba85f81
commit 670ad047b3
5 changed files with 85 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CMakeLists.txt
View File

@ -216,6 +216,8 @@ set(SRCS
cmFileTimeComparison.cxx
cmFileTimeComparison.h
cmFortranParserImpl.cxx
cmFSPermissions.cxx
cmFSPermissions.h
cmGeneratedFileStream.cxx
cmGeneratorExpressionContext.cxx
cmGeneratorExpressionContext.h

34
Source/cmFSPermissions.cxx Normal file
View File

@ -0,0 +1,34 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmFSPermissions.h"
bool cmFSPermissions::stringToModeT(std::string const& arg,
mode_t& permissions)
{
if (arg == "OWNER_READ") {
permissions |= mode_owner_read;
} else if (arg == "OWNER_WRITE") {
permissions |= mode_owner_write;
} else if (arg == "OWNER_EXECUTE") {
permissions |= mode_owner_execute;
} else if (arg == "GROUP_READ") {
permissions |= mode_group_read;
} else if (arg == "GROUP_WRITE") {
permissions |= mode_group_write;
} else if (arg == "GROUP_EXECUTE") {
permissions |= mode_group_execute;
} else if (arg == "WORLD_READ") {
permissions |= mode_world_read;
} else if (arg == "WORLD_WRITE") {
permissions |= mode_world_write;
} else if (arg == "WORLD_EXECUTE") {
permissions |= mode_world_execute;
} else if (arg == "SETUID") {
permissions |= mode_setuid;
} else if (arg == "SETGID") {
permissions |= mode_setgid;
} else {
return false;
}
return true;
}

45
Source/cmFSPermissions.h Normal file
View File

@ -0,0 +1,45 @@
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
file Copyright.txt or https://cmake.org/licensing for details. */
#ifndef cmFSPermissions_h
#define cmFSPermissions_h
#include "cmConfigure.h" // IWYU pragma: keep
#include "cm_sys_stat.h"
#include <string>
namespace cmFSPermissions {
// Table of permissions flags.
#if defined(_WIN32) && !defined(__CYGWIN__)
static const mode_t mode_owner_read = S_IREAD;
static const mode_t mode_owner_write = S_IWRITE;
static const mode_t mode_owner_execute = S_IEXEC;
static const mode_t mode_group_read = 040;
static const mode_t mode_group_write = 020;
static const mode_t mode_group_execute = 010;
static const mode_t mode_world_read = 04;
static const mode_t mode_world_write = 02;
static const mode_t mode_world_execute = 01;
static const mode_t mode_setuid = 04000;
static const mode_t mode_setgid = 02000;
#else
static const mode_t mode_owner_read = S_IRUSR;
static const mode_t mode_owner_write = S_IWUSR;
static const mode_t mode_owner_execute = S_IXUSR;
static const mode_t mode_group_read = S_IRGRP;
static const mode_t mode_group_write = S_IWGRP;
static const mode_t mode_group_execute = S_IXGRP;
static const mode_t mode_world_read = S_IROTH;
static const mode_t mode_world_write = S_IWOTH;
static const mode_t mode_world_execute = S_IXOTH;
static const mode_t mode_setuid = S_ISUID;
static const mode_t mode_setgid = S_ISGID;
#endif
bool stringToModeT(std::string const& arg, mode_t& permissions);
} // ns
#endif

52
Source/cmFileCommand.cxx
View File

@ -20,6 +20,7 @@
#include "cmAlgorithms.h"
#include "cmCommandArgumentsHelper.h"
#include "cmCryptoHash.h"
#include "cmFSPermissions.h"
#include "cmFileLockPool.h"
#include "cmFileTimeComparison.h"
#include "cmGeneratorExpression.h"
@ -50,32 +51,7 @@
class cmSystemToolsFileTime;
// Table of permissions flags.
#if defined(_WIN32) && !defined(__CYGWIN__)
static mode_t mode_owner_read = S_IREAD;
static mode_t mode_owner_write = S_IWRITE;
static mode_t mode_owner_execute = S_IEXEC;
static mode_t mode_group_read = 040;
static mode_t mode_group_write = 020;
static mode_t mode_group_execute = 010;
static mode_t mode_world_read = 04;
static mode_t mode_world_write = 02;
static mode_t mode_world_execute = 01;
static mode_t mode_setuid = 04000;
static mode_t mode_setgid = 02000;
#else
static mode_t mode_owner_read = S_IRUSR;
static mode_t mode_owner_write = S_IWUSR;
static mode_t mode_owner_execute = S_IXUSR;
static mode_t mode_group_read = S_IRGRP;
static mode_t mode_group_write = S_IWGRP;
static mode_t mode_group_execute = S_IXGRP;
static mode_t mode_world_read = S_IROTH;
static mode_t mode_world_write = S_IWOTH;
static mode_t mode_world_execute = S_IXOTH;
static mode_t mode_setuid = S_ISUID;
static mode_t mode_setgid = S_ISGID;
#endif
using namespace cmFSPermissions;
#if defined(_WIN32)
// libcurl doesn't support file:// urls for unicode filenames on Windows.
@ -1099,29 +1075,7 @@ protected:
// Translate an argument to a permissions bit.
bool CheckPermissions(std::string const& arg, mode_t& permissions)
{
if (arg == "OWNER_READ") {
permissions |= mode_owner_read;
} else if (arg == "OWNER_WRITE") {
permissions |= mode_owner_write;
} else if (arg == "OWNER_EXECUTE") {
permissions |= mode_owner_execute;
} else if (arg == "GROUP_READ") {
permissions |= mode_group_read;
} else if (arg == "GROUP_WRITE") {
permissions |= mode_group_write;
} else if (arg == "GROUP_EXECUTE") {
permissions |= mode_group_execute;
} else if (arg == "WORLD_READ") {
permissions |= mode_world_read;
} else if (arg == "WORLD_WRITE") {
permissions |= mode_world_write;
} else if (arg == "WORLD_EXECUTE") {
permissions |= mode_world_execute;
} else if (arg == "SETUID") {
permissions |= mode_setuid;
} else if (arg == "SETGID") {
permissions |= mode_setgid;
} else {
if (!cmFSPermissions::stringToModeT(arg, permissions)) {
std::ostringstream e;
e << this->Name << " given invalid permission \"" << arg << "\".";
this->FileCommand->SetError(e.str());

1
bootstrap
View File

@ -311,6 +311,7 @@ CMAKE_CXX_SOURCES="\
cmFindProgramCommand \
cmForEachCommand \
cmFunctionCommand \
cmFSPermissions \
cmGeneratedFileStream \
cmGeneratorExpression \
cmGeneratorExpressionContext \