X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6849cd848dfa9df7be620dbe7ed24580e93e91b9..7ac2aef2fd35ed0cffe2b558b69643f12662a03e:/links-depth.diff

diff --git a/links-depth.diff b/links-depth.diff
index bf75d9a..30cac5a 100644
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,17 +6,17 @@ 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	2005-11-10 16:58:36
-+++ flist.c	2004-07-16 16:58:04
-@@ -45,6 +45,7 @@ extern int filesfrom_fd;
- extern int one_file_system;
+--- old/flist.c
++++ new/flist.c
+@@ -45,6 +45,7 @@ extern int one_file_system;
+ extern int copy_dirlinks;
  extern int keep_dirlinks;
  extern int preserve_links;
 +extern int follow_links_depth;
  extern int preserve_hard_links;
- extern int preserve_perms;
  extern int preserve_devices;
-@@ -718,6 +719,30 @@ static struct file_struct *receive_file_
+ extern int preserve_specials;
+@@ -715,6 +716,30 @@ static struct file_struct *receive_file_
  	return file;
  }
  
@@ -47,7 +47,7 @@ in this modified version.
  /**
   * Create a file_struct for a named file by reading its stat()
   * information and performing extensive checks against global
-@@ -843,7 +868,13 @@ struct file_struct *make_file(char *fnam
+@@ -849,7 +874,13 @@ struct file_struct *make_file(char *fnam
  	basename_len = strlen(basename) + 1; /* count the '\0' */
  
  #ifdef SUPPORT_LINKS
@@ -62,17 +62,17 @@ in this modified version.
  #else
  	linkname_len = 0;
  #endif
---- orig/options.c	2005-11-15 07:01:03
-+++ options.c	2005-08-27 21:22:39
-@@ -43,6 +43,7 @@ int append_mode = 0;
- int keep_dirlinks = 0;
+--- old/options.c
++++ new/options.c
+@@ -44,6 +44,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;
-@@ -284,6 +285,7 @@ void usage(enum logcode F)
+ int preserve_executability = 0;
+@@ -287,6 +288,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");
@@ -80,7 +80,7 @@ in this modified version.
    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");
-@@ -416,6 +418,7 @@ static struct poptOption long_options[] 
+@@ -432,6 +434,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 },
@@ -88,9 +88,9 @@ in this modified version.
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 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 },
---- orig/rsync.yo	2005-11-15 07:01:04
-+++ rsync.yo	2005-01-28 19:33:40
-@@ -310,6 +310,7 @@ to the detailed description below for a 
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -313,6 +313,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