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

files: distinguish between read error and write error when prepending 

This fixes https://savannah.gnu.org/bugs/?57066.

Bug existed in this form since version 2.4.3 -- in older versions
it segfaulted.
master
Benno Schulenberg 2019-10-18 11:53:47 +02:00
parent 50ed18be17
commit 5390f96900
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/files.c
View File

@ -1703,6 +1703,7 @@ bool write_file(const char *name, FILE *stream, bool tmp,
if (method == PREPEND) {
FILE *source = fopen(realname, "rb");
FILE *target = NULL;
int verdict;
if (source == NULL) {
statusline(ALERT, _("Error reading %s: %s"), realname,
@ -1718,7 +1719,14 @@ bool write_file(const char *name, FILE *stream, bool tmp,
goto cleanup_and_exit;
}
if (copy_file(source, target, TRUE) != 0) {
verdict = copy_file(source, target, TRUE);
if (verdict == -1) {
statusline(ALERT, _("Error reading %s: %s"), realname,
strerror(errno));
unlink(tempname);
goto cleanup_and_exit;
} else if (verdict == -2) {
statusline(ALERT, _("Error writing temp file: %s"),
strerror(errno));
unlink(tempname);