mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaks: remove two calls of umask() by specifying permissions directly

This commit is contained in:
Benno Schulenberg 2020-05-26 12:36:18 +02:00
parent 423105e371
commit f8366cd5c9
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/files.c
View File

@ -1766,30 +1766,25 @@ bool write_file(const char *name, FILE *thefile, bool tmp,
statusbar(_("Writing to FIFO...")); statusbar(_("Writing to FIFO..."));
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
/* When it's not a temporary file, this is where we open or create it. */ /* When it's not a temporary file, this is where we open or create it.
* For an emergency file, access is restricted to just the owner. */
if (thefile == NULL) { if (thefile == NULL) {
mode_t was_mask = 0; mode_t permissions = (tmp ? S_IRUSR|S_IWUSR : RW_FOR_ALL);
int fd; int fd;
/* When creating an emergency file, don't let others access it. */
if (tmp)
was_mask = umask(S_IRWXG | S_IRWXO);
#ifndef NANO_TINY #ifndef NANO_TINY
block_sigwinch(TRUE); block_sigwinch(TRUE);
install_handler_for_Ctrl_C(); install_handler_for_Ctrl_C();
#endif #endif
/* Now open the file. Use O_EXCL for an emergency file. */ /* Now open the file. Use O_EXCL for an emergency file. */
fd = open(realname, O_WRONLY | O_CREAT | ((method == APPEND) ? fd = open(realname, O_WRONLY | O_CREAT | ((method == APPEND) ?
O_APPEND : (tmp ? O_EXCL : O_TRUNC)), RW_FOR_ALL); O_APPEND : (tmp ? O_EXCL : O_TRUNC)), permissions);
#ifndef NANO_TINY #ifndef NANO_TINY
restore_handler_for_Ctrl_C(); restore_handler_for_Ctrl_C();
block_sigwinch(FALSE); block_sigwinch(FALSE);
#endif #endif
/* When this is an emergency file, restore the original umask. */
if (tmp)
umask(was_mask);
/* If we couldn't open the file, give up. */ /* If we couldn't open the file, give up. */
if (fd == -1) { if (fd == -1) {