Updated to apply cleanly.

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

diff --git a/source-cd.diff b/source-cd.diff
index d479da5..adef8e5 100644 (file)
--- a/source-cd.diff
+++ b/source-cd.diff
@@ -6,17 +6,17 @@ 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-02-26 05:22:50
-+++ flist.c    2005-02-26 05:24:15
-@@ -63,6 +63,7 @@ extern int force_delete;
+--- orig/flist.c       2005-02-26 19:27:54
++++ flist.c    2005-02-26 19:34:30
+@@ -59,6 +59,7 @@ extern int copy_unsafe_links;
+ extern int protocol_version;
+ extern int sanitize_paths;
  extern int orig_umask;
- extern int make_backups;
- extern unsigned int curr_dir_len;
 +extern char *source_cd;
- extern char *backup_dir;
- extern char *backup_suffix;
- extern int backup_suffix_len;
-@@ -1078,13 +1079,14 @@ struct file_list *send_file_list(int f, 
+ 
+ extern char curr_dir[MAXPATHLEN];
+ 
+@@ -1075,13 +1076,14 @@ struct file_list *send_file_list(int f, 
  
        io_start_buffering_out();
        if (filesfrom_fd >= 0) {
@@ -36,9 +36,9 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  
        while (1) {
                char fname2[MAXPATHLEN];
---- orig/options.c     2005-02-25 18:44:31
-+++ options.c  2005-02-22 18:06:58
-@@ -81,6 +81,7 @@ char *remote_filesfrom_file = NULL;
+--- orig/options.c     2005-03-01 05:49:24
++++ options.c  2005-03-01 01:37:22
+@@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
  int recurse = 0;
  int xfer_dirs = 0;
@@ -74,10 +74,10 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
        if (read_batch && files_from) {
                snprintf(err_buf, sizeof err_buf,
                        "--read-batch cannot be used with --files-from\n");
-@@ -1006,6 +1014,14 @@ int parse_arguments(int *argc, const cha
+@@ -1004,6 +1012,14 @@ int parse_arguments(int *argc, const cha
+                       partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+               if (backup_dir)
                        backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
-               if (files_from)
-                       files_from = sanitize_path(NULL, files_from, NULL, 0);
 +              if (source_cd)
 +                      source_cd = sanitize_path(NULL, source_cd, NULL, 0);
 +      } else if (source_cd && am_daemon) {
@@ -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;
-@@ -1395,6 +1411,11 @@ void server_options(char **args,int *arg
+@@ -1397,6 +1413,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-02-26 05:22:51
+--- orig/rsync.yo      2005-03-01 01:22:59
 +++ rsync.yo   2005-02-22 18:20:24
 @@ -304,6 +304,7 @@ to the detailed description below for a 
   -R, --relative              use relative path names