X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e66d6d511b675d31a3c55b51fd28d5d2558d094a..9127013998bd097f699897b0f2b142fe2ba71e9d:/fileflags.diff diff --git a/fileflags.diff b/fileflags.diff index cdc34a9..f3acbf4 100644 --- a/fileflags.diff +++ b/fileflags.diff @@ -278,7 +278,7 @@ diff --git a/generator.c b/generator.c #ifdef SUPPORT_HARD_LINKS if (preserve_hard_links && F_HLINK_NOT_FIRST(file) -@@ -2011,13 +2047,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) +@@ -2024,13 +2060,17 @@ static void touch_up_dirs(struct file_list *flist, int ndx) continue; fname = f_name(file, NULL); if (!(file->mode & S_IWUSR)) @@ -534,7 +534,7 @@ diff --git a/rsync.c b/rsync.c if (verbose > 1 && flags & ATTRS_REPORT) { if (updated) rprintf(FCLIENT, "%s\n", fname); -@@ -566,7 +614,8 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -569,7 +617,8 @@ int finish_transfer(const char *fname, const char *fnametmp, /* Change permissions before putting the file into place. */ set_file_attrs(fnametmp, file, NULL, fnamecmp, @@ -544,7 +544,7 @@ diff --git a/rsync.c b/rsync.c /* move tmp file over real file */ if (verbose > 2) -@@ -585,6 +634,10 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -588,6 +637,10 @@ int finish_transfer(const char *fname, const char *fnametmp, } if (ret == 0) { /* The file was moved into place (not copied), so it's done. */ @@ -664,7 +664,7 @@ diff --git a/rsync.yo b/rsync.yo dit(--no-OPTION) You may turn off one or more implied options by prefixing the option name with "no-". Not all options may be prefixed with a "no-": -@@ -792,7 +797,7 @@ they would be using bf(--copy-links). +@@ -798,7 +803,7 @@ they would be using bf(--copy-links). Without this option, if the sending side has replaced a directory with a symlink to a directory, the receiving side will delete anything that is in the way of the new symlink, including a directory hierarchy (as long as @@ -673,7 +673,7 @@ diff --git a/rsync.yo b/rsync.yo See also bf(--keep-dirlinks) for an analogous option for the receiving side. -@@ -929,6 +934,29 @@ super-user copies all namespaces except system.*. A normal user only copies +@@ -935,6 +940,29 @@ super-user copies all namespaces except system.*. A normal user only copies the user.* namespace. To be able to backup and restore non-user namespaces as a normal user, see the bf(--fake-super) option. @@ -703,7 +703,7 @@ diff --git a/rsync.yo b/rsync.yo dit(bf(--chmod)) This option tells rsync to apply one or more comma-separated "chmod" strings to the permission of the files in the transfer. The resulting value is treated as though it was the permissions -@@ -1184,12 +1212,13 @@ See bf(--delete) (which is implied) for more details on file-deletion. +@@ -1190,12 +1218,13 @@ See bf(--delete) (which is implied) for more details on file-deletion. dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files even when there are I/O errors. @@ -720,7 +720,7 @@ diff --git a/rsync.yo b/rsync.yo bf(--recursive) option was also enabled. dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM -@@ -1645,7 +1674,7 @@ with older versions of rsync, but that also turns on the output of other +@@ -1651,7 +1680,7 @@ with older versions of rsync, but that also turns on the output of other verbose messages). The "%i" escape has a cryptic output that is 11 letters long. The general @@ -729,7 +729,7 @@ diff --git a/rsync.yo b/rsync.yo type of update being done, bf(X) is replaced by the file-type, and the other letters represent attributes that may be output if they are being modified. -@@ -1701,7 +1730,7 @@ quote(itemization( +@@ -1707,7 +1736,7 @@ quote(itemization( sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). @@ -940,10 +940,10 @@ diff --git a/t_stub.c b/t_stub.c int human_readable = 0; int module_dirlen = 0; +int force_change = 0; + int preserve_xattrs = 0; mode_t orig_umask = 002; char *partial_dir; - char *module_dir; -@@ -83,3 +84,23 @@ struct filter_list_struct daemon_filter_list; +@@ -89,3 +90,23 @@ struct filter_list_struct daemon_filter_list; { return "tester"; } @@ -975,10 +975,10 @@ diff --git a/util.c b/util.c extern int relative_paths; extern int human_readable; +extern int force_change; + extern int preserve_xattrs; extern char *module_dir; extern unsigned int module_dirlen; - extern mode_t orig_umask; -@@ -122,7 +123,7 @@ NORETURN void overflow_exit(const char *str) +@@ -123,7 +124,7 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } @@ -987,7 +987,7 @@ diff --git a/util.c b/util.c { #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(mode)) -@@ -139,6 +140,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -140,6 +141,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) return 0; { @@ -995,7 +995,7 @@ diff --git a/util.c b/util.c #ifdef HAVE_UTIMES struct timeval t[2]; t[0].tv_sec = time(NULL); -@@ -152,20 +154,39 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -153,20 +155,39 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) return 0; } # endif @@ -1052,7 +1052,7 @@ diff --git a/xattrs.c b/xattrs.c if (rsync_xal_get(fname, sxp->xattr) < 0) { free_xattr(sxp); return -1; -@@ -814,6 +818,11 @@ int set_xattr(const char *fname, const struct file_struct *file, +@@ -856,6 +860,11 @@ int set_xattr(const char *fname, const struct file_struct *file, return -1; } @@ -1064,7 +1064,7 @@ diff --git a/xattrs.c b/xattrs.c ndx = F_XATTR(file); return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp); } -@@ -930,7 +939,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode) +@@ -972,7 +981,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode) mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS) | (S_ISDIR(fst.st_mode) ? 0700 : 0600); if (fst.st_mode != mode)