aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.2-170

Browse Source
This commit is contained in:
Bram Moolenaar
2009-05-13 18:48:16 +00:00
parent 5fd0ca70d3
commit f1726cc8d6
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/buffer.c
View File

@@ -1678,9 +1678,10 @@ buflist_new(ffname, sfname, lnum, flags)
buf->b_fname = buf->b_sfname; buf->b_fname = buf->b_sfname;
#ifdef UNIX #ifdef UNIX
if (st.st_dev == (dev_T)-1) if (st.st_dev == (dev_T)-1)
buf->b_dev = -1; buf->b_dev_valid = FALSE;
else else
{ {
buf->b_dev_valid = TRUE;
buf->b_dev = st.st_dev; buf->b_dev = st.st_dev;
buf->b_ino = st.st_ino; buf->b_ino = st.st_ino;
} }
@@ -2693,9 +2694,10 @@ setfname(buf, ffname, sfname, message)
buf->b_fname = buf->b_sfname; buf->b_fname = buf->b_sfname;
#ifdef UNIX #ifdef UNIX
if (st.st_dev == (dev_T)-1) if (st.st_dev == (dev_T)-1)
buf->b_dev = -1; buf->b_dev_valid = FALSE;
else else
{ {
buf->b_dev_valid = TRUE;
buf->b_dev = st.st_dev; buf->b_dev = st.st_dev;
buf->b_ino = st.st_ino; buf->b_ino = st.st_ino;
} }
@@ -2889,7 +2891,7 @@ otherfile_buf(buf, ffname
/* If no struct stat given, get it now */ /* If no struct stat given, get it now */
if (stp == NULL) if (stp == NULL)
{ {
if (buf->b_dev < 0 || mch_stat((char *)ffname, &st) < 0) if (!buf->b_dev_valid || mch_stat((char *)ffname, &st) < 0)
st.st_dev = (dev_T)-1; st.st_dev = (dev_T)-1;
stp = &st; stp = &st;
} }
@@ -2926,11 +2928,12 @@ buf_setino(buf)
if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0) if (buf->b_fname != NULL && mch_stat((char *)buf->b_fname, &st) >= 0)
{ {
buf->b_dev_valid = TRUE;
buf->b_dev = st.st_dev; buf->b_dev = st.st_dev;
buf->b_ino = st.st_ino; buf->b_ino = st.st_ino;
} }
else else
buf->b_dev = -1; buf->b_dev_valid = FALSE;
} }
/* /*
@@ -2941,7 +2944,7 @@ buf_same_ino(buf, stp)
buf_T *buf; buf_T *buf;
struct stat *stp; struct stat *stp;
{ {
return (buf->b_dev >= 0 return (buf->b_dev_valid
&& stp->st_dev == buf->b_dev && stp->st_dev == buf->b_dev
&& stp->st_ino == buf->b_ino); && stp->st_ino == buf->b_ino);
} }

2
src/fileio.c
View File

@@ -4416,7 +4416,7 @@ restore_backup:
# endif # endif
buf_setino(buf); buf_setino(buf);
} }
else if (buf->b_dev < 0) else if (!buf->b_dev_valid)
/* Set the inode when creating a new file. */ /* Set the inode when creating a new file. */
buf_setino(buf); buf_setino(buf);
#endif #endif

3
src/structs.h
View File

@@ -1166,7 +1166,8 @@ struct file_buffer
char_u *b_fname; /* current file name */ char_u *b_fname; /* current file name */
#ifdef UNIX #ifdef UNIX
dev_t b_dev; /* device number (-1 if not set) */ int b_dev_valid; /* TRUE when b_dev has a valid number */
dev_t b_dev; /* device number */
ino_t b_ino; /* inode number */ ino_t b_ino; /* inode number */
#endif #endif
#ifdef FEAT_CW_EDITOR #ifdef FEAT_CW_EDITOR

2
src/version.c
View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
170,
/**/ /**/
169, 169,
/**/ /**/