From 8d0161c8ffbe656ec1634da62319a869df01d85d Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 12 Jan 2010 11:57:01 -0500 Subject: Trust umask for file permissions Open output files with mode 0666 so that permissions are not more strict than umask permits. See issue #10126. --- Source/cmFileCommand.cxx | 6 ++---- Source/cmWriteFileCommand.cxx | 6 ++---- Source/kwsys/ProcessUNIX.c | 5 ++--- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index bce4137..c2e90b6 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -189,9 +189,7 @@ bool cmFileCommand::HandleWriteCommand(std::vector const& args, #elif defined( __BORLANDC__ ) S_IRUSR | S_IWUSR #else - S_IRUSR | S_IWUSR | - S_IRGRP | - S_IROTH + 0666 #endif ; @@ -202,7 +200,7 @@ bool cmFileCommand::HandleWriteCommand(std::vector const& args, #if defined( _MSC_VER ) || defined( __MINGW32__ ) S_IREAD | S_IWRITE #else - S_IRUSR | S_IWUSR + 0666 #endif ); } diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx index 5c5ad2e..f46b87f 100644 --- a/Source/cmWriteFileCommand.cxx +++ b/Source/cmWriteFileCommand.cxx @@ -60,9 +60,7 @@ bool cmWriteFileCommand #elif defined( __BORLANDC__ ) S_IRUSR | S_IWUSR #else - S_IRUSR | S_IWUSR | - S_IRGRP | - S_IROTH + 0666 #endif ; @@ -73,7 +71,7 @@ bool cmWriteFileCommand #if defined( _MSC_VER ) || defined( __MINGW32__ ) S_IREAD | S_IWRITE #else - S_IRUSR | S_IWUSR + 0666 #endif ); } diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c index 79716a1..373e906 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c @@ -1875,9 +1875,8 @@ static int kwsysProcessSetupOutputPipeFile(int* p, const char* name) /* Close the existing descriptor. */ kwsysProcessCleanupDescriptor(p); - /* Open a file for the pipe to write (permissions 644). */ - if((fout = open(name, O_WRONLY | O_CREAT | O_TRUNC, - S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0) + /* Open a file for the pipe to write. */ + if((fout = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) { return 0; } -- cgit v0.12