mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backup: when rereading the original file fails, ask the user what to do 

Rereading is unlikely to fail, but *if* it fails, maybe there is a
serious problem and the user wants to try and fix it before saving
the buffer and thus overwriting the original file.
This commit is contained in:
Benno Schulenberg 2020-07-17 16:29:10 +02:00
parent da71322000
commit 2623f39c7b
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/files.c
View File

@ -1655,23 +1655,19 @@ bool make_backup_of(char *realname)
original = fopen(realname, "rb");
/* If we can't read from the original file, go on, since saving
* only the current buffer is better than saving nothing. */
if (original == NULL) {
statusline(ALERT, _("Error reading %s: %s"), realname, strerror(errno));
warn_and_briefly_pause(_("Cannot read original file"));
fclose(backup_file);
free(backupname);
return TRUE;
goto failure;
}
/* Copy the existing file to the backup. */
verdict = copy_file(original, backup_file, FALSE);
if (verdict < 0) {
statusline(ALERT, _("Error reading %s: %s"), realname, strerror(errno));
warn_and_briefly_pause(_("Cannot read original file"));
fclose(backup_file);
free(backupname);
return FALSE;
goto failure;
} else if (verdict > 0) {
fclose(backup_file);
goto problem;
@ -1714,6 +1710,7 @@ bool make_backup_of(char *realname)
}
warn_and_briefly_pause(_("Cannot make backup"));
failure:
warn_and_briefly_pause(strerror(errno));
currmenu = MMOST;