debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux doesn't allow open() with O_CREAT without permission flags anymore.

Browse Source
This commit is contained in:
Peter Howkins
2012-03-12 15:39:22 +00:00
parent baf772785b
commit 5a09544b16
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cde/programs/dtstyle/ColorFile.c
View File

@@ -413,7 +413,11 @@ WriteOutPalette(
strcat(filename, PALETTE_SUFFIX); strcat(filename, PALETTE_SUFFIX);
/* open the file for writing */ /* open the file for writing */
#if defined(linux)
if( (fd = open( filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) == -1)
#else
if( (fd = open( filename, O_RDWR | O_CREAT)) == -1) if( (fd = open( filename, O_RDWR | O_CREAT)) == -1)
#endif
{ {
tmpStr = (char *)XtMalloc(strlen(ERR4) + strlen(filename) + 1); tmpStr = (char *)XtMalloc(strlen(ERR4) + strlen(filename) + 1);
sprintf (tmpStr, ERR4, filename); sprintf (tmpStr, ERR4, filename);
@@ -1087,7 +1091,11 @@ CheckFileType( void )
strcat(tmpfile1, DT_PAL_DIR); strcat(tmpfile1, DT_PAL_DIR);
strcat(tmpfile1, filename1); strcat(tmpfile1, filename1);
#if defined(linux)
if( (fd = open( tmpfile1, O_CREAT, S_IRUSR | S_IWUSR)) == -1)
#else
if( (fd = open( tmpfile1, O_CREAT)) == -1) if( (fd = open( tmpfile1, O_CREAT)) == -1)
#endif
{ {
style. longfilename = False; style. longfilename = False;
XtFree(tmpfile1); XtFree(tmpfile1);
@@ -1103,7 +1111,11 @@ CheckFileType( void )
strcat(tmpfile2, DT_PAL_DIR); strcat(tmpfile2, DT_PAL_DIR);
strcat(tmpfile2, filename2); strcat(tmpfile2, filename2);
#if defined(linux)
if( (fd1 = open(tmpfile2, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) == -1)
#else
if( (fd1 = open(tmpfile2, O_CREAT | O_EXCL)) == -1) if( (fd1 = open(tmpfile2, O_CREAT | O_EXCL)) == -1)
#endif
{ {
style.longfilename = False; style.longfilename = False;
} }