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

files: ask the user whether to proceed every time a backup fails 

If the user answered "No" or "Cancel" the first time, they should
be allowed to answer "Yes" the next time -- possibly after fixing
the necessary permissions in another terminal.

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

Bug existed since version 2.3.0, commit 3d411188.
master
Benno Schulenberg 2020-05-29 10:18:25 +02:00
parent 160f07baba
commit eddd8963e7
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/files.c
View File

@ -1477,19 +1477,10 @@ bool outside_of_confinement(const char *currpath, bool allow_tabcomp)
#ifndef NANO_TINY #ifndef NANO_TINY
/* Although this sucks, it sucks less than having a single 'my system is /* Although this sucks, it sucks less than having a single 'my system is
* messed up and I'm blanket allowing insecure file writing operations'. */ * messed up and I'm blanket allowing insecure file writing operations'. */
bool prompt_failed_backupwrite(const char *filename) bool user_wants_to_proceed(void)
{ {
static char *prevfile = NULL; return (do_yesno_prompt(FALSE, _("Cannot make backup; "
/* The last filename we were passed, so we don't keep asking this. */ "continue and save actual file? ")) == 1);
static int choice = 0;
if (prevfile == NULL || strcmp(filename, prevfile)) {
choice = do_yesno_prompt(FALSE, _("Failed to write backup file; "
"continue saving? (Say N if unsure.) "));
prevfile = mallocstrcpy(prevfile, filename);
}
return (choice == 1);
} }
/* Transform the specified backup directory to an absolute path, /* Transform the specified backup directory to an absolute path,
@ -1648,7 +1639,7 @@ bool write_file(const char *name, FILE *thefile, bool tmp,
/* Now first try to delete an existing backup file. */ /* Now first try to delete an existing backup file. */
if (unlink(backupname) < 0 && errno != ENOENT && !ISSET(INSECURE_BACKUP)) { if (unlink(backupname) < 0 && errno != ENOENT && !ISSET(INSECURE_BACKUP)) {
if (prompt_failed_backupwrite(backupname)) if (user_wants_to_proceed())
goto skip_backup; goto skip_backup;
statusline(HUSH, _("Error writing backup file %s: %s"), statusline(HUSH, _("Error writing backup file %s: %s"),
backupname, strerror(errno)); backupname, strerror(errno));
@ -1693,7 +1684,7 @@ bool write_file(const char *name, FILE *thefile, bool tmp,
goto cleanup_and_exit; goto cleanup_and_exit;
} else if (verdict > 0) { } else if (verdict > 0) {
fclose(backup_file); fclose(backup_file);
if (prompt_failed_backupwrite(backupname)) if (user_wants_to_proceed())
goto skip_backup; goto skip_backup;
statusline(HUSH, _("Error writing backup file %s: %s"), statusline(HUSH, _("Error writing backup file %s: %s"),
backupname, strerror(errno)); backupname, strerror(errno));