Updated to apply cleanly.

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

diff --git a/source-cd.diff b/source-cd.diff
index b5f8acd..4bb7545 100644 (file)
--- a/source-cd.diff
+++ b/source-cd.diff
@@ -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-17 09:05:21
+--- orig/options.c     2005-03-24 16:41:46
 +++ options.c  2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
@@ -62,9 +62,9 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-@@ -918,6 +921,11 @@ int parse_arguments(int *argc, const cha
-                       batch_name = NULL;
-               }
+@@ -913,6 +916,11 @@ int parse_arguments(int *argc, const cha
+               } else if (dry_run)
+                       write_batch = 0;
        }
 +      if (source_cd && files_from) {
 +              snprintf(err_buf, sizeof err_buf,
@@ -74,7 +74,7 @@ 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");
-@@ -1012,6 +1020,14 @@ int parse_arguments(int *argc, const cha
+@@ -1007,6 +1015,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);
@@ -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;
-@@ -1405,6 +1421,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";