Updated to apply cleanly.

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

diff --git a/links-depth.diff b/links-depth.diff
index 548f699..3108c21 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       2004-07-15 02:21:10
+--- orig/flist.c       2004-08-11 23:42:23

 +++ flist.c    2004-07-16 16:58:04
 @@ -49,6 +49,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
 +++ flist.c    2004-07-16 16:58:04
 @@ -49,6 +49,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;

-@@ -722,6 +723,30 @@ void receive_file_entry(struct file_stru
+@@ -724,6 +725,30 @@ void receive_file_entry(struct file_stru

  }
  
  
  }
  
  


@@ -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

-@@ -841,7 +866,13 @@ skip_excludes:
+@@ -843,7 +868,13 @@ skip_excludes:

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


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

---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-08-11 23:42:23

 +++ options.c  2004-07-16 16:12:29
 @@ -42,6 +42,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
 +++ options.c  2004-07-16 16:12:29
 @@ -42,6 +42,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;


@@ -72,7 +72,7 @@ in this modified version.
  int preserve_hard_links = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;
  int preserve_hard_links = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;

-@@ -242,6 +243,7 @@ void usage(enum logcode F)
+@@ -244,6 +245,7 @@ void usage(enum logcode F)

    rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");
    rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");


@@ -80,7 +80,7 @@ in this modified version.
    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");
    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");

-@@ -350,6 +352,7 @@ static struct poptOption long_options[] 
+@@ -353,6 +355,7 @@ static struct poptOption long_options[] 

    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },