X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0143ad24b85b7fef602bb952b9a03a9390801701..790ba11acdb77fcd3d81ba5749081f79ded86d04:/links-depth.diff

diff --git a/links-depth.diff b/links-depth.diff
index f665bcf..e908bb8 100644
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,22 +6,28 @@ with the latest codebase, but even in its original form it didn't
 handle relative symlinks properly, and that has not yet been fixed
 in this modified version.
 
---- orig/flist.c	2004-07-15 02:21:10
-+++ flist.c	2004-07-16 16:38:35
-@@ -49,6 +49,7 @@ extern int filesfrom_fd;
- extern int one_file_system;
- extern int keep_dirlinks;
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/links-depth.diff
+    ./configure                          (optional if already run)
+    make
+
+--- old/flist.c
++++ new/flist.c
+@@ -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_perms;
  extern int preserve_devices;
-@@ -722,6 +723,30 @@ void receive_file_entry(struct file_stru
+ extern int preserve_specials;
+@@ -980,6 +981,30 @@ static struct file_struct *recv_file_ent
+ 	return file;
  }
  
- 
 +#if SUPPORT_LINKS
-+void links_depth(char *linkname, STRUCT_STAT *st_ptr)
++static int links_depth(char *linkname, STRUCT_STAT *st_ptr)
 +{
 +	char buf[MAXPATHLEN];
 +	STRUCT_STAT st;
@@ -44,13 +50,13 @@ in this modified version.
 +}
 +#endif
 +
- /**
-  * Create a file_struct for a named file by reading its stat()
-  * information and performing extensive checks against global
-@@ -841,7 +866,13 @@ skip_excludes:
+ /* 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' */
  
- #if SUPPORT_LINKS
+ #ifdef SUPPORT_LINKS
 -	linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0;
 +	if (S_ISLNK(st.st_mode)) {
 +		if (follow_links_depth && links_depth(linkname, &st))
@@ -62,29 +68,39 @@ in this modified version.
  #else
  	linkname_len = 0;
  #endif
---- orig/options.c	2004-07-15 19:11:33
-+++ options.c	2004-07-16 16:12:29
-@@ -42,6 +42,7 @@ int archive_mode = 0;
- int keep_dirlinks = 0;
+--- old/options.c
++++ new/options.c
+@@ -46,6 +46,7 @@ int keep_dirlinks = 0;
+ int copy_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
 +int follow_links_depth = 0;
  int preserve_hard_links = 0;
- int preserve_perms = 0;
- int preserve_devices = 0;
-@@ -235,6 +236,7 @@ void usage(enum logcode F)
-   rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-   rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
+ 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");
 +  rprintf(F,"     --links-depth=NUM       follow symlinks up to NUM depth\n");
-   rprintf(F," -L, --copy-links            copy the referent of all symlinks\n");
-   rprintf(F,"     --copy-unsafe-links     copy the referent of \"unsafe\" symlinks\n");
-   rprintf(F,"     --safe-links            ignore \"unsafe\" symlinks\n");
-@@ -342,6 +344,7 @@ static struct poptOption long_options[] 
-   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
-   {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
-   {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
+   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");
+@@ -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 },
 +  {"links-depth",      0,  POPT_ARG_INT,    &follow_links_depth , 0, 0, 0 },
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
-   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
-   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
+   {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
+   {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -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
++     --links-depth=NUM       follow symlinks up to NUM depth
+  -L, --copy-links            transform symlink into referent file/dir
+      --copy-unsafe-links     only "unsafe" symlinks are transformed
+      --safe-links            ignore symlinks that point outside the tree