search for: pathjoin

...*compare_dest; +extern char *compare_dest[]; extern int link_dest; @@ -69,13 +69,13 @@ if (always_checksum && S_ISREG(st->st_mode)) { char sum[MD4_SUM_LENGTH]; char fnamecmpdest[MAXPATHLEN]; + int i = 0; - if (compare_dest != NULL) { - if (access(fname, 0) != 0) { - pathjoin(fnamecmpdest, sizeof fnamecmpdest, - compare_dest, fname); - fname = fnamecmpdest; - } + while ((access(fname, 0) != 0) && compare_dest[i] != NULL) { + pathjoin(fnamecmpdest, sizeof fnamecmpdest, + compare_dest[i], fname); + fname = fnamecmpdest; + i++; } file_che...

Hi All, the following patches implement the recursively snapshotting and deleting of a subvolume. To snapshot recursively you must pass the -R switch: # btrfs subvolume create sub1 Create subvolume ''./sub1'' # btrfs subvolume create sub1/sub2 Create subvolume ''sub1/sub2'' # btrfs subvolume snapshot -R sub1 sub1-snap Create a snapshot of

...erent checksum as unchanged, for example. Please be aware that the patch is untested. Florian diff --git a/generator.c b/generator.c index a112da6..2df1b28 100644 --- a/generator.c +++ b/generator.c @@ -876,26 +876,22 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode)) continue; - switch (match_level) { - case 0: + if (match_level < 1) { best_match = j; match_level = 1; - /* FALL THROUGH */ - case 1: - if (!unchange...

https://bugzilla.samba.org/show_bug.cgi?id=12036 Bug ID: 12036 Summary: Multiple --link-dest, --copy-dest, or --compare-dest flags produce incorrect behavior Product: rsync Version: 3.1.2 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P5 Component:

Hi there, I am using rsync to synchronize two folders. I have configured the log-format to my personal needs like this: --log-format="%f %t %o %l %P" I am also using the --delete flag to log deleted files as well. I have upgraded my rsync version to 2.6.9 when I figured out that starting with version 2.6.4 the log format had been enhanced to also include the "del."

...fnamecmp_type); - exit_cleanup(RERR_PROTOCOL); + fnamecmp = fname; + break; } pathjoin(fnamecmpbuf, sizeof fnamecmpbuf, basis_dir[fnamecmp_type], fname); My restore went 5 times faster, and I verified (with rsync!) that I ended up with the same tree. I didn't really know what I was doing, but am I on the right track? Can anyone think of...

...s = arg; (s = strchr(s, '/')) != NULL; ) { *s = '\0'; - if (check_filter(&server_filter_list, arg, 1) < 0) { + if (check_filter(&server_filter_list, arg, 1) == M_EXCLUDE) { /* We must leave arg truncated! */ return 1; } @@ -967,7 +967,7 @@ if ((int)pathjoin(t, sz, partial_dir, fn) >= sz) return NULL; if (server_filter_list.head - && check_filter(&server_filter_list, partial_fname, 0) < 0) + && check_filter(&server_filter_list, partial_fname, 0) == M_EXCLUDE) return NULL; return partial_fname;

...reserve_acls; extern int preserve_xattrs; extern int preserve_links; extern int preserve_devices; +extern int copy_devices; extern int preserve_specials; extern int preserve_hard_links; extern int preserve_executability; @@ -980,7 +981,7 @@ static int try_dests_reg(struct file_str do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); - if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode)) + if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !(S_ISREG(sxp->st.st_mode) || (copy_devices && IS_DEVICE(sxp->st.st_mode)))) continue; switch (m...