summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7462c6a)
- Made the XSTATE_* defines avoid using 0.
- Call !XATTR_ABBREV() in recv_xattr_request().
- Improved the "internal abbrev" error message.
- Fixed the potential for a directory time glitch in xattrs.diff.
rm "$todir/file2"
echo extra >file1
rm "$todir/file2"
echo extra >file1
checkit "$RSYNC -aiiX . ../to" "$chkdir" "$todir"
checkit "$RSYNC -aiiX . ../to" "$chkdir" "$todir"
#define XATTR_ABBREV(x) ((size_t)((x).name - (x).datum) < (x).datum_len)
#define XATTR_ABBREV(x) ((size_t)((x).name - (x).datum) < (x).datum_len)
-#define XSTATE_ABBREV 0
-#define XSTATE_DONE 1
-#define XSTATE_TODO 2
+#define XSTATE_ABBREV 1
+#define XSTATE_DONE 2
+#define XSTATE_TODO 3
#define USER_PREFIX "user."
#define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
#define USER_PREFIX "user."
#define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
who_am_i(), num, f_name(file, NULL));
exit_cleanup(RERR_STREAMIO);
}
who_am_i(), num, f_name(file, NULL));
exit_cleanup(RERR_STREAMIO);
}
- if (rxa->datum_len <= MAX_FULL_DATUM || rxa->datum[0] != XSTATE_ABBREV) {
- rprintf(FERROR, "[%s] internal abbrev error!\n", who_am_i());
+ if (!XATTR_ABBREV(*rxa) || rxa->datum[0] != XSTATE_ABBREV) {
+ rprintf(FERROR, "[%s] internal abbrev error on %s (%s, len=%d)!\n",
+ who_am_i(), f_name(file, NULL), rxa->name, rxa->datum_len);
exit_cleanup(RERR_STREAMIO);
}
exit_cleanup(RERR_STREAMIO);
}