Skip to content

Commit fed7ac7

Browse files
author
Ahmed Bilal
committed
[io] Replace hardcoded 0644 permissions with 0666 to respect umask
This change allows the system umask to control file permissions instead of hardcoding them to 0644. Files will now be created with permissions determined by (0666 & ~umask), which is the standard Unix behavior. Files modified: - io/io/src/TFile.cxx - io/io/src/TMapFile.cxx - io/io/src/TMemFile.cxx - io/dcache/src/TDCacheFile.cxx - net/net/src/TFTP.cxx - net/net/src/TApplicationServer.cxx Fixes #17095
1 parent ab4d4b4 commit fed7ac7

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

io/dcache/src/TDCacheFile.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ TDCacheFile::TDCacheFile(const char *path, Option_t *option,
140140

141141
if (create || update) {
142142
#ifndef WIN32
143-
fD = SysOpen(fname, O_RDWR | O_CREAT, 0644);
143+
fD = SysOpen(fname, O_RDWR | O_CREAT, 0666);
144144
#else
145145
fD = SysOpen(fname, O_RDWR | O_CREAT | O_BINARY, S_IREAD | S_IWRITE);
146146
#endif
@@ -151,7 +151,7 @@ TDCacheFile::TDCacheFile(const char *path, Option_t *option,
151151
fWritable = kTRUE;
152152
} else {
153153
#ifndef WIN32
154-
fD = SysOpen(fname, O_RDONLY, 0644);
154+
fD = SysOpen(fname, O_RDONLY, 0666);
155155
#else
156156
fD = SysOpen(fname, O_RDONLY | O_BINARY, S_IREAD | S_IWRITE);
157157
#endif

io/io/src/TFile.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ TFile::TFile(const char *fname1, Option_t *option, const char *ftitle, Int_t com
533533
// Connect to file system stream
534534
if (create || update) {
535535
#ifndef WIN32
536-
fD = TFile::SysOpen(fname.Data(), O_RDWR | O_CREAT, 0644);
536+
fD = TFile::SysOpen(fname.Data(), O_RDWR | O_CREAT, 0666);
537537
#else
538538
fD = TFile::SysOpen(fname.Data(), O_RDWR | O_CREAT | O_BINARY, S_IREAD | S_IWRITE);
539539
#endif
@@ -545,7 +545,7 @@ TFile::TFile(const char *fname1, Option_t *option, const char *ftitle, Int_t com
545545
fWritable = kTRUE;
546546
} else {
547547
#ifndef WIN32
548-
fD = TFile::SysOpen(fname.Data(), O_RDONLY, 0644);
548+
fD = TFile::SysOpen(fname.Data(), O_RDONLY, 0666);
549549
#else
550550
fD = TFile::SysOpen(fname.Data(), O_RDONLY | O_BINARY, S_IREAD | S_IWRITE);
551551
#endif
@@ -2236,7 +2236,7 @@ Int_t TFile::ReOpen(Option_t *mode)
22362236
// open in READ mode
22372237
fOption = opt; // set fOption before SysOpen() for TNetFile
22382238
#ifndef WIN32
2239-
fD = SysOpen(fRealName, O_RDONLY, 0644);
2239+
fD = SysOpen(fRealName, O_RDONLY, 0666);
22402240
#else
22412241
fD = SysOpen(fRealName, O_RDONLY | O_BINARY, S_IREAD | S_IWRITE);
22422242
#endif
@@ -2258,7 +2258,7 @@ Int_t TFile::ReOpen(Option_t *mode)
22582258
// open in UPDATE mode
22592259
fOption = opt; // set fOption before SysOpen() for TNetFile
22602260
#ifndef WIN32
2261-
fD = SysOpen(fRealName, O_RDWR | O_CREAT, 0644);
2261+
fD = SysOpen(fRealName, O_RDWR | O_CREAT, 0666);
22622262
#else
22632263
fD = SysOpen(fRealName, O_RDWR | O_CREAT | O_BINARY, S_IREAD | S_IWRITE);
22642264
#endif

io/io/src/TMapFile.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ TMapFile::TMapFile(const char *name, const char *title, Option_t *option,
333333
// Open file to which memory will be mapped
334334
if (create || update) {
335335
#ifndef WIN32
336-
fFd = open(fname, O_RDWR | O_CREAT, 0644);
336+
fFd = open(fname, O_RDWR | O_CREAT, 0666);
337337
#else
338338
fFd = (Longptr_t) CreateFile(fname, // pointer to name of the file
339339
GENERIC_WRITE | GENERIC_READ, // access (read-write) mode

io/io/src/TMemFile.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,15 @@ TMemFile::TMemFile(const char *path, char *buffer, Long64_t size, Option_t *opti
179179
Int_t mode = O_RDWR | O_CREAT;
180180
if (optmode == EMode::kRecreate) mode |= O_TRUNC;
181181

182-
fD = TMemFile::SysOpen(path, mode, 0644);
182+
fD = TMemFile::SysOpen(path, mode, 0666);
183183
if (fD == -1) {
184184
SysError("TMemFile", "file %s can not be opened", path);
185185
goto zombie;
186186
}
187187
fWritable = kTRUE;
188188

189189
} else {
190-
fD = TMemFile::SysOpen(path, O_RDONLY, 0644);
190+
fD = TMemFile::SysOpen(path, O_RDONLY, 0666);
191191
if (fD == -1) {
192192
SysError("TMemFile", "file %s can not be opened for reading", path);
193193
goto zombie;

net/net/src/TApplicationServer.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ Int_t TApplicationServer::ReceiveFile(const char *file, Bool_t bin, Long64_t siz
788788

789789
close(fd);
790790

791-
chmod(file, 0644);
791+
chmod(file, 0666);
792792

793793
return 0;
794794
}

net/net/src/TFTP.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ Long64_t TFTP::GetFile(const char *file, const char *localName)
593593
delete [] buf; delete [] buf2;
594594

595595
#ifndef R__WIN32
596-
fchmod(fd, 0644);
596+
fchmod(fd, 0666);
597597
#endif
598598

599599
close(fd);

0 commit comments

Comments
 (0)