X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..51bc0e8954bdeb4314d3792352179be64f4a8fe8:/links-depth.diff diff --git a/links-depth.diff b/links-depth.diff index 3e5df59..e908bb8 100644 --- a/links-depth.diff +++ b/links-depth.diff @@ -14,15 +14,15 @@ To use this patch, run these commands for a successful build: --- old/flist.c +++ new/flist.c -@@ -41,6 +41,7 @@ extern int one_file_system; - extern int copy_dirlinks; - extern int keep_dirlinks; +@@ -47,6 +47,7 @@ extern int keep_dirlinks; + extern int preserve_acls; + extern int preserve_xattrs; extern int preserve_links; +extern int follow_links_depth; extern int preserve_hard_links; extern int preserve_devices; extern int preserve_specials; -@@ -702,6 +703,30 @@ static struct file_struct *receive_file_ +@@ -980,6 +981,30 @@ static struct file_struct *recv_file_ent return file; } @@ -50,10 +50,10 @@ To use this patch, run these commands for a successful build: +} +#endif + - /** - * Create a file_struct for a named file by reading its stat() - * information and performing extensive checks against global -@@ -837,7 +862,13 @@ struct file_struct *make_file(char *fnam + /* Create a file_struct for a named file by reading its stat() information + * and performing extensive checks against global options. + * +@@ -1120,7 +1145,13 @@ struct file_struct *make_file(const char basename_len = strlen(basename) + 1; /* count the '\0' */ #ifdef SUPPORT_LINKS @@ -76,9 +76,9 @@ To use this patch, run these commands for a successful build: int preserve_links = 0; +int follow_links_depth = 0; int preserve_hard_links = 0; - int preserve_perms = 0; - int preserve_executability = 0; -@@ -297,6 +298,7 @@ void usage(enum logcode F) + int preserve_acls = 0; + int preserve_xattrs = 0; +@@ -321,6 +322,7 @@ void usage(enum logcode F) rprintf(F," --append append data onto shorter files\n"); rprintf(F," -d, --dirs transfer directories without recursing\n"); rprintf(F," -l, --links copy symlinks as symlinks\n"); @@ -86,7 +86,7 @@ To use this patch, run these commands for a successful build: rprintf(F," -L, --copy-links transform symlink into referent file/dir\n"); rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n"); rprintf(F," --safe-links ignore symlinks that point outside the source tree\n"); -@@ -447,6 +449,7 @@ static struct poptOption long_options[] +@@ -496,6 +498,7 @@ static struct poptOption long_options[] {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 }, {"no-links", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, {"no-l", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 }, @@ -96,7 +96,7 @@ To use this patch, run these commands for a successful build: {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 }, --- old/rsync.yo +++ new/rsync.yo -@@ -314,6 +314,7 @@ to the detailed description below for a +@@ -335,6 +335,7 @@ to the detailed description below for a --append append data onto shorter files -d, --dirs transfer directories without recursing -l, --links copy symlinks as symlinks