From 130cdd0d90ca44fbd70b031aaf599785dddb26ab Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 29 May 2010 10:57:02 -0700 Subject: [PATCH] Avoid a double-increment of a file's st_dev value while supporting older rsyncs that send dev == 0. --- flist.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flist.c b/flist.c index ad6b5bf0..2f94420e 100644 --- a/flist.c +++ b/flist.c @@ -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 -- 2.34.1