X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/52e09c4e076125dd724f969fe00062f2a0815de4..8871c12ac6de6b52f034946d009f0f9f5f5b808d:/flags.diff?ds=sidebyside diff --git a/flags.diff b/flags.diff index c67eda0..77c8bdd 100644 --- a/flags.diff +++ b/flags.diff @@ -74,7 +74,7 @@ TODO: fix --delete-delay to work with --flags option. else mode = file->mode; +#ifdef SUPPORT_FLAGS -+ if (F_FFLAGS(file) == fileflags) ++ if (F_FFLAGS(file) == fileflags) + xflags |= XMIT_SAME_FLAGS; + else + fileflags = F_FFLAGS(file); @@ -87,7 +87,7 @@ TODO: fix --delete-delay to work with --flags option. if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); +#ifdef SUPPORT_FLAGS -+ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + write_int(f, (int)fileflags); +#endif if (uid_ndx && !(xflags & XMIT_SAME_UID)) { @@ -98,7 +98,7 @@ TODO: fix --delete-delay to work with --flags option. static int64 modtime; static mode_t mode; +#ifdef SUPPORT_FLAGS -+ static uint32 fileflags; ++ static uint32 fileflags; +#endif static int64 dev; static dev_t rdev; @@ -111,7 +111,7 @@ TODO: fix --delete-delay to work with --flags option. if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); +#ifdef SUPPORT_FLAGS -+ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) ++ if (fileflags_ndx && !(xflags & XMIT_SAME_FLAGS)) + fileflags = (uint32)read_int(f); +#endif @@ -305,7 +305,7 @@ TODO: fix --delete-delay to work with --flags option. char const *links = "no "; char const *iconv = "no "; char const *ipv6 = "no "; -+ char const *fileflags = "no "; ++ char const *fileflags = "no "; STRUCT_STAT *dumstat; #if SUBPROTOCOL_VERSION != 0