mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-04-25 00:29:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid a double-increment of a file's st_dev value

Browse Source 
while supporting older rsyncs that send dev == 0.
This commit is contained in:
Wayne Davison
2010-05-29 10:57:02 -07:00
parent db22e586da
commit 130cdd0d90
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flist.c
View File

@@ -130,7 +130,7 @@ int flist_eof = 0; /* all the file-lists are now known */
* will survive just long enough to be used by send_file_entry(). */
static dev_t tmp_rdev;
#ifdef SUPPORT_HARD_LINKS
static int64 tmp_dev, tmp_ino;
static int64 tmp_dev = -1, tmp_ino;
#endif
static char tmp_sum[MAX_DIGEST_LEN];
@@ -508,7 +508,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
xflags |= XMIT_MOD_NSEC;
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0) {
if (tmp_dev != -1) {
if (protocol_version >= 30) {
struct ht_int64_node *np = idev_find(tmp_dev, tmp_ino);
first_hlink_ndx = (int32)(long)np->data - 1;
@@ -641,7 +641,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
#endif
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != 0 && protocol_version < 30) {
if (tmp_dev != -1 && protocol_version < 30) {
if (protocol_version < 26) {
/* 32-bit dev_t and ino_t */
write_int(f, (int32)dev);
@@ -1341,10 +1341,10 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
if (protocol_version >= 28
? (!S_ISDIR(st.st_mode) && st.st_nlink > 1)
: S_ISREG(st.st_mode)) {
tmp_dev = (int64)st.st_dev + 1;
tmp_dev = (int64)st.st_dev;
tmp_ino = (int64)st.st_ino;
} else
tmp_dev = 0;
tmp_dev = -1;
}
#endif