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

tweaks: check the return value of copy_file() also after its other uses

master
Benno Schulenberg 2019-10-18 12:31:31 +02:00
parent 5390f96900
commit f2d6e6fa5e
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/files.c
View File

@ -1560,7 +1560,7 @@ bool write_file(const char *name, FILE *stream, bool tmp,
openfile->current_stat->st_mtime == st.st_mtime)) { openfile->current_stat->st_mtime == st.st_mtime)) {
static struct timespec filetime[2]; static struct timespec filetime[2];
char *backupname; char *backupname;
int backup_cflags, backup_fd; int backup_cflags, backup_fd, verdict;
FILE *original = NULL, *backup_file = NULL; FILE *original = NULL, *backup_file = NULL;
/* Save the original file's access and modification times. */ /* Save the original file's access and modification times. */
@ -1677,11 +1677,20 @@ bool write_file(const char *name, FILE *stream, bool tmp,
} }
/* Copy the file. */ /* Copy the file. */
if (copy_file(original, backup_file, FALSE) != 0) { verdict = copy_file(original, backup_file, FALSE);
if (verdict == -1) {
fclose(backup_file); fclose(backup_file);
statusline(ALERT, _("Error reading %s: %s"), realname, statusline(ALERT, _("Error reading %s: %s"), realname,
strerror(errno)); strerror(errno));
goto cleanup_and_exit; goto cleanup_and_exit;
} else if (verdict == -2) {
fclose(backup_file);
if (prompt_failed_backupwrite(backupname))
goto skip_backup;
statusline(HUSH, _("Error writing backup file %s: %s"),
backupname, strerror(errno));
goto cleanup_and_exit;
} }
/* And set the backup's timestamps. */ /* And set the backup's timestamps. */
@ -1843,6 +1852,7 @@ bool write_file(const char *name, FILE *stream, bool tmp,
/* 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) {
FILE *source = fopen(tempname, "rb"); FILE *source = fopen(tempname, "rb");
int verdict;
if (source == NULL) { if (source == NULL) {
statusline(ALERT, _("Error reading %s: %s"), tempname, statusline(ALERT, _("Error reading %s: %s"), tempname,
@ -1851,7 +1861,13 @@ bool write_file(const char *name, FILE *stream, bool tmp,
goto cleanup_and_exit; goto cleanup_and_exit;
} }
if (copy_file(source, thefile, TRUE) != 0) { verdict = copy_file(source, thefile, TRUE);
if (verdict == -1) {
statusline(ALERT, _("Error reading %s: %s"), tempname,
strerror(errno));
goto cleanup_and_exit;
} else if (verdict == -2) {
statusline(ALERT, _("Error writing %s: %s"), realname, statusline(ALERT, _("Error writing %s: %s"), realname,
strerror(errno)); strerror(errno));
goto cleanup_and_exit; goto cleanup_and_exit;