Updated to apply cleanly.

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

diff --git a/links-depth.diff b/links-depth.diff
index 94c5e90..b9add60 100644 (file)
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -6,9 +6,9 @@ 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-02-26 19:27:54
+--- orig/flist.c       2005-03-16 02:19:29.897764030

 +++ flist.c    2004-07-16 16:58:04
 +++ flist.c    2004-07-16 16:58:04

-@@ -47,6 +47,7 @@ extern int filesfrom_fd;
+@@ -45,6 +45,7 @@ extern int filesfrom_fd;

  extern int one_file_system;
  extern int keep_dirlinks;
  extern int preserve_links;
  extern int one_file_system;
  extern int keep_dirlinks;
  extern int preserve_links;


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

---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-16 02:19:30.152741841

 +++ options.c  2005-01-28 19:33:24
 @@ -43,6 +43,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
 +++ options.c  2005-01-28 19:33:24
 @@ -43,6 +43,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;

-@@ -274,6 +275,7 @@ void usage(enum logcode F)
+@@ -275,6 +276,7 @@ void usage(enum logcode F)

    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -d, --dirs                  transfer directories without recursing\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");
    rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\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");
    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");

-@@ -396,6 +398,7 @@ static struct poptOption long_options[] 
+@@ -398,6 +400,7 @@ static struct poptOption long_options[] 

    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
    {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
    {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
    {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 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-03-01 01:22:59
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806

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

-@@ -311,6 +311,7 @@ to the detailed description below for a 
+@@ -310,6 +310,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