search for: force_change

...the rsync distribution? Reporting a bug via bugzilla? Best regards Franz -------------- next part -------------- #ifdef HAVE_LINK int do_link(const char *fname1, const char *fname2) { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; if (link(fname1, fname2) == 0) return 0; #ifdef SUPPORT_FORCE_CHANGE if (force_change && (errno == EPERM || errno == EACCES)) { char parent[MAXPATHLEN]; int parent_flags; int saved_errno = errno; int file_flags = make_mutable(fname1, NULL, NO_FFLAGS, force_change); if (file_flags) { int ret = link(fname1, fname2); undo_make_mutable(fn...

...iatus: rsync 3 has been working very well for me for many years, as a supplementary backup tool for MacOSX. However, attempting to build the new 3.1.0 release on a brand new Mountain Lion box with my standard 'fileflags' and 'crimes' patches applied, make fails, reporting that 'force_change' is undeclared. In fact, the problem occurs just with the 'fileflags' patch alone: patch -p1 <patches/fileflags.diff ./configure make This generates the error: gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -I./zlib -c main.c -o main.o main.c:846:6: error: use of undecl...

...option. I therefore tried to compile rsync with the 3 relevant patches : - fileflags.diff - crtimes.diff - detect-renamed.diff But the patch detect-renamed.diff is not compatible with one of the modifications of fileflags.diff The problem is minor : a) fileflags.diff inserts "extern int force_change;" line 33 diff --git a/compat.c b/compat.c --- a/compat.c +++ b/compat.c @@ -42,9 +42,11 @@ extern int checksum_seed; extern int basis_dir_cnt; extern int prune_empty_dirs; extern int protocol_version; +extern int force_change; extern int protect_args; extern int preserve_uid;...

...-3.0.5_base/receiver.c rsync-3.0.5/receiver.c --- rsync-3.0.5_base/receiver.c 2008-11-15 16:49:28.000000000 -0600 +++ rsync-3.0.5/receiver.c 2009-03-10 22:18:20.000000000 -0500 @@ -39,6 +42,7 @@ extern int preserve_hard_links; extern int preserve_perms; extern int preserve_xattrs; +extern int force_change; extern int basis_dir_cnt; extern int make_backups; extern int cleanup_got_literal; @@ -153,6 +157,20 @@ } #endif +#ifdef SUPPORT_FORCE_CHANGE + if (fd == -1) { + stat_x sx; + if (do_stat(file->dirname, &sx.st) < 0) + rprintf(FINFO, "Failed to stat %s!\n", full_f...

...ferred (code 23) at main.c(1031) [sender=3.0.3dev] PATCH: --- rsync-3.0.2_base/rsync.c 2008-04-08 21:37:18.000000000 -0500 +++ rsync-3.0.2/rsync.c 2008-04-14 13:05:44.000000000 -0500 @@ -31,6 +31,7 @@ extern int dry_run; extern int preserve_acls; extern int preserve_xattrs; +extern int force_change; extern int preserve_perms; extern int preserve_fileflags; extern int preserve_executability; @@ -445,6 +446,11 @@ if (daemon_chmod_modes && !S_ISLNK(new_mode)) new_mode = tweak_mode(new_mode, daemon_chmod_modes); +#ifdef SUPPORT_FORCE_CHANGE + if (force_change) + make_mutabl...

...mutable are now reported (I think this also resolves an issue in which rsync would report "Unknown error (0)") - rsync.c: make_mutable is now called in set_file_attrs allowing set_file_attrs to apply acls, xattrs, times, etc. to files in locked directories. - syscall.c: Added make_mutable/force_change functionality to many of these system calls -- Configure bugmail: https://bugzilla.samba.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA contact for the bug.

.../rsync.c rsync-3.0.3pre3_patched/rsync.c --- rsync-3.0.3pre3_base/rsync.c 2008-06-23 22:31:58.000000000 -0700 +++ rsync-3.0.3pre3_patched/rsync.c 2008-06-23 22:59:03.000000000 -0700 @@ -31,6 +31,7 @@ extern int dry_run; extern int preserve_acls; extern int preserve_xattrs; +extern int force_change; extern int preserve_perms; extern int preserve_fileflags; extern int preserve_executability; @@ -445,6 +446,11 @@ if (daemon_chmod_modes && !S_ISLNK(new_mode)) new_mode = tweak_mode(new_mode, daemon_chmod_modes); +#ifdef SUPPORT_FORCE_CHANGE + if (force_ch...

...2009-09-29 15:34:03.293118000 +0200 +++ syscall.c 2009-09-29 16:11:29.400671306 +0200 @@ -82,7 +82,23 @@ { if (dry_run) return 0; RETURN_ERROR_IF_RO_OR_LO; - return link(fname1, fname2); + if (link(fname1, fname2) == 0) + return 0; +#ifdef SUPPORT_FORCE_CHANGE + if (force_change && errno == EPERM) { + STRUCT_STAT st; + + if (x_lstat(fname1, &st, NULL) == 0 + && make_mutable(fname1, st.st_mode, st.st_flags, force_change) > 0) { + int ret = link(fname1, fname...

...imes' undeclared (first use in this function) compat.c:144: error: (Each undeclared identifier is reported only once compat.c:144: error: for each function it appears in.) compat.c:146: error: 'preserve_fileflags' undeclared (first use in this function) compat.c:146: error: 'force_change' undeclared (first use in this function) make: *** [compat.o] Error 1 3/ with more patches : fileflags.diff crtimes.diff crtimes-64bit.diff crtimes-hfs+.diff hfs_compression.diff detect-renamed.diff ==> same error as the initial test : gcc -std=gnu99 -I. -I. -m32 -DHAVE_CON...

...+ extern int am_root; ++extern int detect_renamed; extern int make_backups; extern int max_delete; -+extern int detect_renamed; - extern char *backup_dir; - extern char *backup_suffix; - extern int backup_suffix_len; -@@ -44,6 +45,8 @@ static inline int is_backup_file(char *fn) + extern int force_change; +@@ -45,6 +46,8 @@ * its contents, otherwise just checks for content. Returns DR_SUCCESS or * DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The * buffer is used for recursion, but returned unchanged.) @@ -786,13 +786,13 @@ @@ -353,7 +354,7 @@ void set_blocking(int...