mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 01:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

shada: Add warning about removing/renaming temporary file

Browse Source
This commit is contained in:
ZyX
2015-08-08 14:26:38 +03:00
parent 1542fc221e
commit 42fbfd3aee
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/shada.c
View File

@@ -3001,11 +3001,13 @@ shada_write_file_nomerge: {}
if (!nomerge) { if (!nomerge) {
sd_reader.close(&sd_reader); sd_reader.close(&sd_reader);
bool did_remove = false;
if (sw_ret == kSDWriteSuccessfull) { if (sw_ret == kSDWriteSuccessfull) {
if (vim_rename(tempname, fname) == -1) { if (vim_rename(tempname, fname) == -1) {
EMSG3(_(RNERR "Can't rename ShaDa file from %s to %s!"), EMSG3(_(RNERR "Can't rename ShaDa file from %s to %s!"),
tempname, fname); tempname, fname);
} else { } else {
did_remove = true;
os_remove(tempname); os_remove(tempname);
} }
} else { } else {
@@ -3017,6 +3019,10 @@ shada_write_file_nomerge: {}
"during writing it"), tempname, fname); "during writing it"), tempname, fname);
} }
} }
if (!did_remove) {
EMSG3(_(RNERR "Do not forget to remove %s or rename it manually to %s."),
tempname, fname);
}
xfree(tempname); xfree(tempname);
} }