ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tweaks: move a call of umask() closer to where it is relevant

master
Benno Schulenberg 2019-10-17 17:29:11 +02:00
parent a6365707c0
commit 50ed18be17
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/files.c
View File

@ -1509,8 +1509,6 @@ bool write_file(const char *name, FILE *stream, bool tmp,
#endif #endif
struct stat st; struct stat st;
/* The status fields filled in by stat(). */ /* The status fields filled in by stat(). */
mode_t was_mask = 0;
/* Will be set to the umask from when nano was started. */
char *realname; char *realname;
/* The filename after tilde expansion. */ /* The filename after tilde expansion. */
FILE *thefile = stream; FILE *thefile = stream;
@ -1701,13 +1699,6 @@ bool write_file(const char *name, FILE *stream, bool tmp,
} }
skip_backup: skip_backup:
#endif /* !NANO_TINY */
/* When going to create an emergency file, don't let others access it. */
if (stream == NULL && tmp)
was_mask = umask(S_IRWXG | S_IRWXO);
#ifndef NANO_TINY
/* When prepending, first copy the existing file to a temporary file. */ /* When prepending, first copy the existing file to a temporary file. */
if (method == PREPEND) { if (method == PREPEND) {
FILE *source = fopen(realname, "rb"); FILE *source = fopen(realname, "rb");
@ -1740,7 +1731,13 @@ bool write_file(const char *name, FILE *stream, bool tmp,
#endif /* !NANO_TINY */ #endif /* !NANO_TINY */
if (stream == NULL) { if (stream == NULL) {
mode_t was_mask = 0;
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();