Updated to apply cleanly.

[rsync/rsync-patches.git] / source-cd.diff

diff --git a/source-cd.diff b/source-cd.diff
index a784de2..69e33bd 100644 (file)
--- a/source-cd.diff
+++ b/source-cd.diff
@@ -6,7 +6,7 @@ rsync -avR --source-cd=/usr local/bin host:/
 
 For two systems where one uses /usr/local/bin and the other /local/bin.
 
---- orig/flist.c       2005-03-16 02:19:29
+--- orig/flist.c       2005-03-30 17:31:41
 +++ flist.c    2005-03-05 00:31:42
 @@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
@@ -16,7 +16,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  extern struct stats stats;
  extern struct file_list *the_file_list;
  
-@@ -1085,13 +1086,14 @@ struct file_list *send_file_list(int f, 
+@@ -1086,13 +1087,14 @@ struct file_list *send_file_list(int f, 
  
        io_start_buffering_out();
        if (filesfrom_fd >= 0) {
@@ -36,7 +36,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  
        while (1) {
                struct file_struct *file;
---- orig/options.c     2005-03-28 20:56:55
+--- orig/options.c     2005-03-31 00:24:21
 +++ options.c  2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
@@ -89,7 +89,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
-@@ -1401,6 +1417,11 @@ void server_options(char **args,int *arg
+@@ -1400,6 +1416,11 @@ void server_options(char **args,int *arg
        } else if (keep_partial)
                args[ac++] = "--partial";
  
@@ -101,7 +101,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        if (ignore_errors)
                args[ac++] = "--ignore-errors";
  
---- orig/rsync.yo      2005-03-28 20:56:55
+--- orig/rsync.yo      2005-03-30 16:57:29
 +++ rsync.yo   2005-02-22 18:20:24
 @@ -303,6 +303,7 @@ to the detailed description below for a 
   -R, --relative              use relative path names