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

tweaks: add a symbol, in order to condense three function calls

master
Benno Schulenberg 2020-05-17 19:11:54 +02:00
parent 40a0463250
commit 44fd299921
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/files.c
View File

@ -31,6 +31,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/wait.h> #include <sys/wait.h>
#define RW_FOR_ALL (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
#ifndef NANO_TINY #ifndef NANO_TINY
static pid_t pid_of_command = -1; static pid_t pid_of_command = -1;
/* The PID of a forked process -- needed when wanting to abort it. */ /* The PID of a forked process -- needed when wanting to abort it. */
@ -155,8 +157,7 @@ bool write_lockfile(const char *lockfilename, const char *filename, bool modifie
cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND; cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND;
/* Try to create the lockfile. */ /* Try to create the lockfile. */
fd = open(lockfilename, cflags, fd = open(lockfilename, cflags, RW_FOR_ALL);
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
if (fd < 0) { if (fd < 0) {
statusline(MILD, _("Error writing lock file %s: %s"), statusline(MILD, _("Error writing lock file %s: %s"),
@ -1686,8 +1687,7 @@ bool write_file(const char *name, FILE *thefile, bool tmp,
else else
backup_cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND; backup_cflags = O_WRONLY | O_CREAT | O_EXCL | O_APPEND;
backup_fd = open(backupname, backup_cflags, backup_fd = open(backupname, backup_cflags, RW_FOR_ALL);
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
if (backup_fd >= 0) if (backup_fd >= 0)
backup_file = fdopen(backup_fd, "wb"); backup_file = fdopen(backup_fd, "wb");
@ -1806,8 +1806,7 @@ bool write_file(const char *name, FILE *thefile, bool tmp,
#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)), S_IRUSR | O_APPEND : (tmp ? O_EXCL : O_TRUNC)), RW_FOR_ALL);
S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
#ifndef NANO_TINY #ifndef NANO_TINY
restore_handler_for_Ctrl_C(); restore_handler_for_Ctrl_C();