mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-26 04:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

FileID: refactor ex_cmds2.c to use FileID

Browse Source
This commit is contained in:
Stefan Hoffmann
2014-05-27 19:38:30 +02:00
parent a294a0e1c5
commit fc2a668c7c
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/ex_cmds2.c
View File

@@ -45,6 +45,7 @@
#include "nvim/window.h" #include "nvim/window.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/os/shell.h" #include "nvim/os/shell.h"
#include "nvim/os/fs_defs.h"
/* Growarray to store info about already sourced scripts. /* Growarray to store info about already sourced scripts.
@@ -52,9 +53,8 @@
* script when going through the list. */ * script when going through the list. */
typedef struct scriptitem_S { typedef struct scriptitem_S {
char_u *sn_name; char_u *sn_name;
int sn_dev_valid; bool file_id_valid;
uint64_t sn_dev; FileID file_id;
uint64_t sn_ino;
int sn_prof_on; /* TRUE when script is/was profiled */ int sn_prof_on; /* TRUE when script is/was profiled */
int sn_pr_force; /* forceit: profile functions in this script */ int sn_pr_force; /* forceit: profile functions in this script */
proftime_T sn_pr_child; /* time set when going into first child */ proftime_T sn_pr_child; /* time set when going into first child */
@@ -2559,15 +2559,14 @@ do_source (
* If it's new, generate a new SID. * If it's new, generate a new SID.
*/ */
save_current_SID = current_SID; save_current_SID = current_SID;
FileInfo file_info; FileID file_id;
bool file_info_ok = os_get_file_info((char *)fname_exp, &file_info); bool file_id_ok = os_get_file_id((char *)fname_exp, &file_id);
for (current_SID = script_items.ga_len; current_SID > 0; --current_SID) { for (current_SID = script_items.ga_len; current_SID > 0; --current_SID) {
si = &SCRIPT_ITEM(current_SID); si = &SCRIPT_ITEM(current_SID);
// Compare dev/ino when possible, it catches symbolic links. // Compare dev/ino when possible, it catches symbolic links.
// Also compare file names, the inode may change when the file was edited. // Also compare file names, the inode may change when the file was edited.
bool file_id_equal = file_info_ok && si->sn_dev_valid bool file_id_equal = file_id_ok && si->file_id_valid
&& si->sn_dev == file_info.stat.st_dev && os_file_id_equal(&(si->file_id), &file_id);
&& si->sn_ino == file_info.stat.st_ino;
if (si->sn_name != NULL if (si->sn_name != NULL
&& (file_id_equal || fnamecmp(si->sn_name, fname_exp) == 0)) { && (file_id_equal || fnamecmp(si->sn_name, fname_exp) == 0)) {
break; break;
@@ -2584,12 +2583,11 @@ do_source (
si = &SCRIPT_ITEM(current_SID); si = &SCRIPT_ITEM(current_SID);
si->sn_name = fname_exp; si->sn_name = fname_exp;
fname_exp = NULL; fname_exp = NULL;
if (file_info_ok) { if (file_id_ok) {
si->sn_dev_valid = TRUE; si->file_id_valid = true;
si->sn_dev = file_info.stat.st_dev; si->file_id = file_id;
si->sn_ino = file_info.stat.st_ino;
} else { } else {
si->sn_dev_valid = FALSE; si->file_id_valid = false;
} }
/* Allocate the local script variables to use for this script. */ /* Allocate the local script variables to use for this script. */