Fixed failing hunks.

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

diff --git a/links-depth.diff b/links-depth.diff
index 90bc544c3b707b3f568659c56910367e8d0620ed..bf4d031c9cc2f4454428389f6e9b0d943a4c8f32 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.
 
---- orig/flist.c       2005-05-28 08:24:57
+--- orig/flist.c       2005-08-17 06:45:07
 +++ flist.c    2004-07-16 16:58:04
 @@ -45,6 +45,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
@@ -62,9 +62,9 @@ in this modified version.
  #else
        linkname_len = 0;
  #endif
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-01-28 19:33:24
-@@ -42,6 +42,7 @@ int archive_mode = 0;
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:22:39
+@@ -42,6 +42,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
  int preserve_links = 0;
@@ -72,8 +72,8 @@ in this modified version.
  int preserve_hard_links = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;
-@@ -276,6 +277,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
+@@ -278,6 +279,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");
@@ -81,17 +81,17 @@ in this modified version.
    rprintf(F,"     --copy-unsafe-links     only \"unsafe\" symlinks are transformed\n");
    rprintf(F,"     --safe-links            ignore symlinks that point outside the source tree\n");
 @@ -402,6 +404,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 },
+   {"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 },
-   {"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-05-22 20:53:34
+   {"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-08-27 21:05:12
 +++ rsync.yo   2005-01-28 19:33:40
-@@ -311,6 +311,7 @@ to the detailed description below for a 
-      --inplace               update destination files in-place
+@@ -312,6 +312,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