Updated to apply cleanly.

[rsync/rsync-patches.git] / links-depth.diff

diff --git a/links-depth.diff b/links-depth.diff
index 2a7cba6..da3f6c1 100644 (file)
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,7 +6,7 @@ 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.
 
 handle relative symlinks properly, and that has not yet been fixed
 in this modified version.
 

---- orig/flist.c       2005-01-28 19:08:20
+--- orig/flist.c       2005-02-03 02:04:20

 +++ flist.c    2004-07-16 16:58:04
 @@ -52,6 +52,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
 +++ flist.c    2004-07-16 16:58:04
 @@ -52,6 +52,7 @@ extern int filesfrom_fd;
  extern int one_file_system;


@@ -16,7 +16,7 @@ in this modified version.
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int preserve_devices;
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int preserve_devices;

-@@ -740,6 +741,30 @@ void receive_file_entry(struct file_stru
+@@ -738,6 +739,30 @@ static void receive_file_entry(struct fi

  }
  
  
  }
  
  


@@ -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
  /**
   * Create a file_struct for a named file by reading its stat()
   * information and performing extensive checks against global

-@@ -864,7 +889,13 @@ skip_filters:
+@@ -862,7 +887,13 @@ skip_filters:

        basename_len = strlen(basename) + 1; /* count the '\0' */
  
  #if SUPPORT_LINKS
        basename_len = strlen(basename) + 1; /* count the '\0' */
  
  #if SUPPORT_LINKS


@@ -62,9 +62,9 @@ in this modified version.
  #else
        linkname_len = 0;
  #endif
  #else
        linkname_len = 0;
  #endif

---- orig/options.c     2005-01-28 19:08:20
+--- orig/options.c     2005-02-01 10:39:22

 +++ options.c  2005-01-28 19:33:24
 +++ options.c  2005-01-28 19:33:24

-@@ -42,6 +42,7 @@ int archive_mode = 0;
+@@ -43,6 +43,7 @@ int archive_mode = 0;

  int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;


@@ -88,9 +88,9 @@ in this modified version.
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
    {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },

---- orig/rsync.yo      2005-01-28 17:12:14
+--- orig/rsync.yo      2005-02-01 10:39:23

 +++ rsync.yo   2005-01-28 19:33:40
 +++ rsync.yo   2005-01-28 19:33:40

-@@ -322,6 +322,7 @@ verb(
+@@ -311,6 +311,7 @@ to the detailed description below for a 

       --inplace               update destination files in-place
   -d, --dirs                  transfer directories without recursing
   -l, --links                 copy symlinks as symlinks
       --inplace               update destination files in-place
   -d, --dirs                  transfer directories without recursing
   -l, --links                 copy symlinks as symlinks