Skip to content

Commit

Permalink
Merge pull request #619 from stefan991/mch_stat-cleanup
Browse files Browse the repository at this point in the history 
Replace `struct stat` with `FileInfo`
  • Loading branch information
@justinmk
justinmk committed May 9, 2014
2 parents f3dda65 + eae498c commit 1a3ee71
Show file tree
Hide file tree
Showing 25 changed files with 578 additions and 641 deletions.
172 changes: 67 additions & 105 deletions src/buffer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,32 +65,26 @@
#include "ui.h"
#include "undo.h"
#include "window.h"
#include "os/os.h"

// Todo(stefan991): remove this macro
#define INVALID_DEVICE_ID UINT64_MAX

static char_u *buflist_match(regprog_T *prog, buf_T *buf);
# define HAVE_BUFLIST_MATCH
static char_u *fname_match(regprog_T *prog, char_u *name);
static void buflist_setfpos(buf_T *buf, win_T *win, linenr_T lnum,
colnr_T col, int copy_options);
static wininfo_T *find_wininfo(buf_T *buf, int skip_diff_buffer);
#ifdef UNIX
static buf_T *buflist_findname_stat(char_u *ffname, struct stat *st);
static int otherfile_buf(buf_T *buf, char_u *ffname, struct stat *stp);
static int buf_same_ino(buf_T *buf, struct stat *stp);
#else
static int otherfile_buf(buf_T *buf, char_u *ffname);
#endif
static buf_T *buflist_findname_file_info(char_u *ffname, FileInfo *file_info);
static int otherfile_buf(buf_T *buf, char_u *ffname, FileInfo *file_info);
static int buf_same_ino(buf_T *buf, FileInfo *file_info);
static int ti_change(char_u *str, char_u **last);
static int append_arg_number(win_T *wp, char_u *buf, int buflen, int add_file);
static void free_buffer(buf_T *);
static void free_buffer_stuff(buf_T *buf, int free_options);
static void clear_wininfo(buf_T *buf);

#ifdef UNIX
# define dev_T dev_t
#else
# define dev_T unsigned
#endif

static void insert_sign(buf_T *buf, signlist_T *prev, signlist_T *next, int id, linenr_T lnum, int typenr);

static char *msg_loclist = N_("[Location List]");
Expand Down Expand Up @@ -1304,29 +1298,20 @@ buflist_new (
)
{
buf_T *buf;
#ifdef UNIX
struct stat st;
#endif

fname_expand(curbuf, &ffname, &sfname); /* will allocate ffname */

/*
* If file name already exists in the list, update the entry.
*/
#ifdef UNIX
/* On Unix we can use inode numbers when the file exists. Works better
/* We can use inode numbers when the file exists. Works better
* for hard links. */
if (sfname == NULL || mch_stat((char *)sfname, &st) < 0)
st.st_dev = (dev_T)-1;
#endif
if (ffname != NULL && !(flags & BLN_DUMMY) && (buf =
#ifdef UNIX
buflist_findname_stat(ffname,
&st)
#else
buflist_findname(ffname)
#endif
) != NULL) {
FileInfo file_info;
if (sfname == NULL || !os_get_file_info((char *)sfname, &file_info)) {
file_info.stat.st_dev = INVALID_DEVICE_ID;
}
if (ffname != NULL && !(flags & BLN_DUMMY)
&& (buf = buflist_findname_file_info(ffname, &file_info)) != NULL) {
free(ffname);
if (lnum != 0)
buflist_setfpos(buf, curwin, lnum, (colnr_T)0, FALSE);
Expand Down Expand Up @@ -1452,15 +1437,13 @@ buflist_new (
hash_init(&buf->b_s.b_keywtab_ic);

buf->b_fname = buf->b_sfname;
#ifdef UNIX
if (st.st_dev == (dev_T)-1)
if (file_info.stat.st_dev == INVALID_DEVICE_ID)
buf->b_dev_valid = FALSE;
else {
buf->b_dev_valid = TRUE;
buf->b_dev = st.st_dev;
buf->b_ino = st.st_ino;
buf->b_dev = file_info.stat.st_dev;
buf->b_ino = file_info.stat.st_ino;
}
#endif
buf->b_u_synced = TRUE;
buf->b_flags = BF_CHECK_RO | BF_NEVERLOADED;
if (flags & BLN_DUMMY)
Expand Down Expand Up @@ -1682,31 +1665,28 @@ buf_T *buflist_findname_exp(char_u *fname)
*/
buf_T *buflist_findname(char_u *ffname)
{
#ifdef UNIX
struct stat st;

if (mch_stat((char *)ffname, &st) < 0)
st.st_dev = (dev_T)-1;
return buflist_findname_stat(ffname, &st);
FileInfo file_info;
if (!os_get_file_info((char *)ffname, &file_info)) {
file_info.stat.st_dev = INVALID_DEVICE_ID;
}
return buflist_findname_file_info(ffname, &file_info);
}

/*
* Same as buflist_findname(), but pass the stat structure to avoid getting it
* twice for the same file.
* Same as buflist_findname(), but pass the FileInfo structure to avoid
* getting it twice for the same file.
* Returns NULL if not found.
*/
static buf_T *buflist_findname_stat(char_u *ffname, struct stat *stp)
static buf_T *buflist_findname_file_info(char_u *ffname, FileInfo *file_info)
{
#endif
buf_T *buf;

for (buf = firstbuf; buf != NULL; buf = buf->b_next)
if ((buf->b_flags & BF_DUMMY) == 0 && !otherfile_buf(buf, ffname
#ifdef UNIX
, stp
#endif
))
for (buf = firstbuf; buf != NULL; buf = buf->b_next) {
if ((buf->b_flags & BF_DUMMY) == 0
&& !otherfile_buf(buf, ffname, file_info)) {
return buf;
}
}
return NULL;
}

Expand Down Expand Up @@ -2220,19 +2200,15 @@ setfname (
)
{
buf_T *obuf = NULL;
#ifdef UNIX
struct stat st;
#endif
FileInfo file_info;

if (ffname == NULL || *ffname == NUL) {
/* Removing the name. */
free(buf->b_ffname);
free(buf->b_sfname);
buf->b_ffname = NULL;
buf->b_sfname = NULL;
#ifdef UNIX
st.st_dev = (dev_T)-1;
#endif
file_info.stat.st_dev = INVALID_DEVICE_ID;
} else {
fname_expand(buf, &ffname, &sfname); /* will allocate ffname */
if (ffname == NULL) /* out of memory */
Expand All @@ -2243,16 +2219,12 @@ setfname (
* - if the buffer is loaded, fail
* - if the buffer is not loaded, delete it from the list
*/
#ifdef UNIX
if (mch_stat((char *)ffname, &st) < 0)
st.st_dev = (dev_T)-1;
#endif
if (!(buf->b_flags & BF_DUMMY))
#ifdef UNIX
obuf = buflist_findname_stat(ffname, &st);
#else
obuf = buflist_findname(ffname);
#endif
if (!os_get_file_info((char *)ffname, &file_info)) {
file_info.stat.st_dev = INVALID_DEVICE_ID;
}
if (!(buf->b_flags & BF_DUMMY)) {
obuf = buflist_findname_file_info(ffname, &file_info);
}
if (obuf != NULL && obuf != buf) {
if (obuf->b_ml.ml_mfp != NULL) { /* it's loaded, fail */
if (message)
Expand All @@ -2278,15 +2250,13 @@ setfname (
buf->b_sfname = sfname;
}
buf->b_fname = buf->b_sfname;
#ifdef UNIX
if (st.st_dev == (dev_T)-1)
if (file_info.stat.st_dev == INVALID_DEVICE_ID) {
buf->b_dev_valid = FALSE;
else {
} else {
buf->b_dev_valid = TRUE;
buf->b_dev = st.st_dev;
buf->b_ino = st.st_ino;
buf->b_dev = file_info.stat.st_dev;
buf->b_ino = file_info.stat.st_ino;
}
#endif

buf_name_changed(buf);
return OK;
Expand Down Expand Up @@ -2419,80 +2389,72 @@ void buflist_altfpos(win_T *win)
*/
int otherfile(char_u *ffname)
{
return otherfile_buf(curbuf, ffname
#ifdef UNIX
, NULL
#endif
);
return otherfile_buf(curbuf, ffname, NULL);
}

static int otherfile_buf(buf_T *buf, char_u *ffname
#ifdef UNIX
, struct stat *stp
#endif
)
static int otherfile_buf(buf_T *buf, char_u *ffname, FileInfo *file_info_p)
{
/* no name is different */
if (ffname == NULL || *ffname == NUL || buf->b_ffname == NULL)
if (ffname == NULL || *ffname == NUL || buf->b_ffname == NULL) {
return TRUE;
if (fnamecmp(ffname, buf->b_ffname) == 0)
}
if (fnamecmp(ffname, buf->b_ffname) == 0) {
return FALSE;
#ifdef UNIX
}
{
struct stat st;
FileInfo file_info;

/* If no struct stat given, get it now */
if (stp == NULL) {
if (!buf->b_dev_valid || mch_stat((char *)ffname, &st) < 0)
st.st_dev = (dev_T)-1;
stp = &st;
if (file_info_p == NULL) {
if (!buf->b_dev_valid || !os_get_file_info((char *)ffname, &file_info)) {
file_info.stat.st_dev = INVALID_DEVICE_ID;
}
file_info_p = &file_info;
}
/* Use dev/ino to check if the files are the same, even when the names
* are different (possible with links). Still need to compare the
* name above, for when the file doesn't exist yet.
* Problem: The dev/ino changes when a file is deleted (and created
* again) and remains the same when renamed/moved. We don't want to
* mch_stat() each buffer each time, that would be too slow. Get the
* stat() each buffer each time, that would be too slow. Get the
* dev/ino again when they appear to match, but not when they appear
* to be different: Could skip a buffer when it's actually the same
* file. */
if (buf_same_ino(buf, stp)) {
if (buf_same_ino(buf, file_info_p)) {
buf_setino(buf);
if (buf_same_ino(buf, stp))
if (buf_same_ino(buf, file_info_p))
return FALSE;
}
}
#endif
return TRUE;
}

#if defined(UNIX) || defined(PROTO)
/*
* Set inode and device number for a buffer.
* Must always be called when b_fname is changed!.
*/
void buf_setino(buf_T *buf)
{
struct stat st;

if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0) {
FileInfo file_info;
if (buf->b_fname != NULL
&& os_get_file_info((char *)buf->b_fname, &file_info)) {
buf->b_dev_valid = TRUE;
buf->b_dev = st.st_dev;
buf->b_ino = st.st_ino;
} else
buf->b_dev = file_info.stat.st_dev;
buf->b_ino = file_info.stat.st_ino;
} else {
buf->b_dev_valid = FALSE;
}
}

/*
* Return TRUE if dev/ino in buffer "buf" matches with "stp".
*/
static int buf_same_ino(buf_T *buf, struct stat *stp)
static int buf_same_ino(buf_T *buf, FileInfo *file_info)
{
return buf->b_dev_valid
&& stp->st_dev == buf->b_dev
&& stp->st_ino == buf->b_ino;
&& file_info->stat.st_dev == buf->b_dev
&& file_info->stat.st_ino == buf->b_ino;
}
#endif

/*
* Print info about the current buffer.
Expand Down
6 changes: 2 additions & 4 deletions src/buffer_defs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,11 +423,9 @@ struct file_buffer {
char_u *b_sfname; /* short file name */
char_u *b_fname; /* current file name */

#ifdef UNIX
int b_dev_valid; /* TRUE when b_dev has a valid number */
dev_t b_dev; /* device number */
ino_t b_ino; /* inode number */
#endif
uint64_t b_dev; /* device number */
uint64_t b_ino; /* inode number */

int b_fnum; /* buffer number for this file. */

Expand Down
6 changes: 3 additions & 3 deletions src/diff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -863,8 +863,6 @@ void ex_diffpatch(exarg_T *eap)
char_u dirbuf[MAXPATHL];
char_u *fullname = NULL;
#endif // ifdef UNIX
struct stat st;

// We need two temp file names.
// Name of original temp file.
char_u *tmp_orig = vim_tempname('o');
Expand Down Expand Up @@ -965,7 +963,9 @@ void ex_diffpatch(exarg_T *eap)
os_remove((char *)buf);

// Only continue if the output file was created.
if ((mch_stat((char *)tmp_new, &st) < 0) || (st.st_size == 0)) {
off_t file_size;
bool file_size_success = os_get_file_size((char *)tmp_new, &file_size);
if (!file_size_success || file_size == 0) {
EMSG(_("E816: Cannot read patch output"));
} else {
if (curbuf->b_fname != NULL) {
Expand Down
Loading

0 comments on commit 1a3ee71

Please sign in to comment.