Updated to apply cleanly.

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

diff --git a/source-cd.diff b/source-cd.diff
index 4bb754504b3d911974805024b56e541ea436ab92..a784de24130ff78b67013b6cb0e57718586dd6a2 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-24 16:41:46
+--- orig/options.c     2005-03-28 20:56:55
 +++ options.c  2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
@@ -54,7 +54,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
    rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-@@ -419,6 +421,7 @@ static struct poptOption long_options[] 
+@@ -420,6 +422,7 @@ static struct poptOption long_options[] 
    {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
    {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
    {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
@@ -62,7 +62,7 @@ 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 },
-@@ -913,6 +916,11 @@ int parse_arguments(int *argc, const cha
+@@ -914,6 +917,11 @@ int parse_arguments(int *argc, const cha
                } else if (dry_run)
                        write_batch = 0;
        }
@@ -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");
-@@ -1007,6 +1015,14 @@ int parse_arguments(int *argc, const cha
+@@ -1008,6 +1016,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;
-@@ -1400,6 +1416,11 @@ void server_options(char **args,int *arg
+@@ -1401,6 +1417,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-16 02:19:30
+--- orig/rsync.yo      2005-03-28 20:56:55
 +++ 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
@@ -111,7 +111,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
   -b, --backup                make backups (see --suffix & --backup-dir)
       --backup-dir=DIR        make backups into hierarchy based in DIR
       --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
-@@ -510,6 +511,11 @@ the bf(--no-implied-dirs) option would o
+@@ -511,6 +512,11 @@ the bf(--no-implied-dirs) option would o
  which means that if "/path" was a real directory on one machine and a
  symlink of the other machine, rsync would not try to change this.