aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-15 23:14:06 -05:00
Code Activity

patch 8.2.1970: it is easy to make mistakes when cleaning up swap files

Browse Source 
Problem:    It is easy to make mistakes when cleaning up swap files after the
            system crashed.
Solution:   Warn for the process still running after recovery.  Do not
            automatically delete a swap file created on another system.
            (David Fries, closes #7273)
This commit is contained in:
Bram Moolenaar
2020-11-09 21:04:17 +01:00
parent ea696852e7
commit f883508e36
3 changed files with 77 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/memline.c
View File

@@ -1690,7 +1690,17 @@ ml_recover(int checkext)
}
else
msg(_("Recovery completed. Buffer contents equals file contents."));
msg_puts(_("\nYou may want to delete the .swp file now.\n\n"));
msg_puts(_("\nYou may want to delete the .swp file now."));
#if defined(UNIX) || defined(MSWIN)
if (mch_process_running(char_to_long(b0p->b0_pid)))
{
// Warn there could be an active Vim on the same file, the user may
// want to kill it.
msg_puts(_("\nNote: process STILL RUNNING: "));
msg_outnum(char_to_long(b0p->b0_pid));
}
#endif
msg_puts("\n\n");
cmdline_row = msg_row;
}
#ifdef FEAT_CRYPT
@@ -2230,14 +2240,30 @@ swapfile_unchanged(char_u *fname)
ret = FALSE;
#if defined(UNIX) || defined(MSWIN)
// Host name must be known and must equal the current host name, otherwise
// comparing pid is meaningless.
if (*(b0.b0_hname) == NUL)
{
ret = FALSE;
}
else
{
char_u hostname[B0_HNAME_SIZE];
mch_get_host_name(hostname, B0_HNAME_SIZE);
hostname[B0_HNAME_SIZE - 1] = NUL;
if (STRICMP(b0.b0_hname, hostname) != 0)
ret = FALSE;
}
// process must be known and not be running
pid = char_to_long(b0.b0_pid);
if (pid == 0L || mch_process_running(pid))
ret = FALSE;
#endif
// TODO: Should we check if the swap file was created on the current
// system? And the current user?
// We do not check the user, it should be irrelevant for whether the swap
// file is still useful.
close(fd);
return ret;