Fix some fuzz in the --help text hunks.

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

diff --git a/links-depth.diff b/links-depth.diff
index f665bcf..548f699 100644 (file)
--- a/links-depth.diff
+++ b/links-depth.diff
@@ -7,7 +7,7 @@ handle relative symlinks properly, and that has not yet been fixed
 in this modified version.
 
 --- orig/flist.c       2004-07-15 02:21:10
-+++ flist.c    2004-07-16 16:38:35
++++ flist.c    2004-07-16 16:58:04
 @@ -49,6 +49,7 @@ extern int filesfrom_fd;
  extern int one_file_system;
  extern int keep_dirlinks;
@@ -21,7 +21,7 @@ in this modified version.
  
  
 +#if SUPPORT_LINKS
-+void links_depth(char *linkname, STRUCT_STAT *st_ptr)
++static int links_depth(char *linkname, STRUCT_STAT *st_ptr)
 +{
 +      char buf[MAXPATHLEN];
 +      STRUCT_STAT st;
@@ -62,7 +62,7 @@ in this modified version.
  #else
        linkname_len = 0;
  #endif
---- orig/options.c     2004-07-15 19:11:33
+--- orig/options.c     2004-07-16 20:07:22
 +++ options.c  2004-07-16 16:12:29
 @@ -42,6 +42,7 @@ int archive_mode = 0;
  int keep_dirlinks = 0;
@@ -72,16 +72,16 @@ in this modified version.
  int preserve_hard_links = 0;
  int preserve_perms = 0;
  int preserve_devices = 0;
-@@ -235,6 +236,7 @@ void usage(enum logcode F)
-   rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
+@@ -242,6 +243,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,"     --links-depth=NUM       follow symlinks up to NUM depth\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");
-@@ -342,6 +344,7 @@ static struct poptOption long_options[] 
-   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
+@@ -350,6 +352,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 },
 +  {"links-depth",      0,  POPT_ARG_INT,    &follow_links_depth , 0, 0, 0 },