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

tweaks: simplify the opening of files when prepending 

There is no need for a file descriptor: all reading and writing
is done on streams.
master
Benno Schulenberg 2019-10-17 12:08:50 +02:00
parent b554606047
commit eb757e7c5b
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/files.c
View File

@ -1711,16 +1711,8 @@ bool write_file(const char *name, FILE *stream, bool tmp,
#ifndef NANO_TINY #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) {
int fd_src; FILE *source = fopen(realname, "rb");
FILE *source = NULL, *target = NULL; FILE *target = NULL;
fd_src = open(realname, O_RDONLY);
if (fd_src != -1) {
source = fdopen(fd_src, "rb");
if (source == NULL)
close(fd_src);
}
if (source == NULL) { if (source == NULL) {
statusline(ALERT, _("Error reading %s: %s"), realname, statusline(ALERT, _("Error reading %s: %s"), realname,
@ -1846,16 +1838,7 @@ bool write_file(const char *name, FILE *stream, bool tmp,
#ifndef NANO_TINY #ifndef NANO_TINY
/* When prepending, append the temporary file to what we wrote above. */ /* When prepending, append the temporary file to what we wrote above. */
if (method == PREPEND) { if (method == PREPEND) {
int fd_src; FILE *source = fopen(tempname, "rb");
FILE *source = NULL;
fd_src = open(tempname, O_RDONLY);
if (fd_src != -1) {
source = fdopen(fd_src, "rb");
if (source == NULL)
close(fd_src);
}
if (source == NULL) { if (source == NULL) {
statusline(ALERT, _("Error reading %s: %s"), tempname, statusline(ALERT, _("Error reading %s: %s"), tempname,