From: Wayne Davison Date: Sat, 29 Sep 2007 01:36:57 +0000 (+0000) Subject: Got rid of some leftover start-of-line spaces prior to a tab X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/8871c12ac6de6b52f034946d009f0f9f5f5b808d Got rid of some leftover start-of-line spaces prior to a tab (leftovers from patch merges). --- diff --git a/atimes.diff b/atimes.diff index 173e3e9..b60c9c4 100644 --- a/atimes.diff +++ b/atimes.diff @@ -495,7 +495,7 @@ TODO: need to fix this to handle 64-bit time_t values! + printf(" %6ld.%-6ld %6ld %s%s%s%s\n", (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink, - datebuf, fname, linkbuf); -+ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "", ++ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "", + fname, linkbuf); } 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 diff --git a/netgroup-auth.diff b/netgroup-auth.diff index 5062a82..8732782 100644 --- a/netgroup-auth.diff +++ b/netgroup-auth.diff @@ -21,7 +21,7 @@ To use this patch, run these commands for a successful build: { if (!host || !*host) return 0; -+ if (*tok == '@' && tok[1]) ++ if (*tok == '@' && tok[1]) + return innetgr(tok + 1, host, NULL, NULL); return wildmatch(tok, host); }