aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_files_file__util.h
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_files_file__util.h')
-rw-r--r--www/chromium/files/patch-base_files_file__util.h25
1 files changed, 21 insertions, 4 deletions
diff --git a/www/chromium/files/patch-base_files_file__util.h b/www/chromium/files/patch-base_files_file__util.h
index 7b393a0021a0..bf2c4dce52dd 100644
--- a/www/chromium/files/patch-base_files_file__util.h
+++ b/www/chromium/files/patch-base_files_file__util.h
@@ -1,11 +1,28 @@
---- base/files/file_util.h.orig 2020-07-07 21:58:11 UTC
+--- base/files/file_util.h.orig 2020-11-13 06:36:34 UTC
+++ base/files/file_util.h
-@@ -552,7 +552,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
+@@ -278,14 +278,14 @@ BASE_EXPORT bool SetPosixFilePermissions(const FilePat
+ BASE_EXPORT bool ExecutableExistsInPath(Environment* env,
+ const FilePath::StringType& executable);
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD)
+ // Determine if files under a given |path| can be mapped and then mprotect'd
+ // PROT_EXEC. This depends on the mount options used for |path|, which vary
+ // among different Linux distributions and possibly local configuration. It also
+ // depends on details of kernel--ChromeOS uses the noexec option for /dev/shm
+ // but its kernel allows mprotect with PROT_EXEC anyway.
+ BASE_EXPORT bool IsPathExecutable(const FilePath& path);
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD)
+
+ #endif // OS_POSIX
+
+@@ -592,7 +592,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas
// the directory |path|, in the number of FilePath::CharType, or -1 on failure.
BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path);
--#if defined(OS_LINUX) || defined(OS_AIX)
-+#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD)
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_AIX) || defined(OS_BSD)
// Broad categories of file systems as returned by statfs() on Linux.
enum FileSystemType {
FILE_SYSTEM_UNKNOWN, // statfs failed.