Updated to apply cleanly.

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

diff --git a/source-cd.diff b/source-cd.diff
index 4972dba361bfc668de91146a28b0c6cde61b95a4..757a24b682ba71c43e12ba4101275d2ff9ba8cc0 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 19:27:54
-+++ flist.c    2005-02-26 19:34:30
-@@ -59,6 +59,7 @@ extern int copy_unsafe_links;
+--- orig/flist.c       2005-03-16 02:19:29.897764030
++++ flist.c    2005-03-05 00:31:42
+@@ -57,6 +57,7 @@ extern int copy_unsafe_links;
  extern int protocol_version;
  extern int sanitize_paths;
  extern int orig_umask;
 +extern char *source_cd;
+ extern struct stats stats;
+ extern struct file_list *the_file_list;
  
- extern char curr_dir[MAXPATHLEN];
- 
-@@ -1075,13 +1076,14 @@ struct file_list *send_file_list(int f, 
+@@ -1085,13 +1086,14 @@ struct file_list *send_file_list(int f, 
  
        io_start_buffering_out();
        if (filesfrom_fd >= 0) {
@@ -35,8 +35,8 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
 +      }
  
        while (1) {
-               char fname2[MAXPATHLEN];
---- orig/options.c     2005-03-01 01:22:59
+               struct file_struct *file;
+--- orig/options.c     2005-03-16 02:19:30.152741841
 +++ options.c  2005-03-01 01:37:22
 @@ -81,6 +81,7 @@ char *filesfrom_host = NULL;
  int eol_nulls = 0;
@@ -46,7 +46,7 @@ For two systems where one uses /usr/local/bin and the other /local/bin.
  int am_daemon = 0;
  int daemon_over_rsh = 0;
  int do_stats = 0;
-@@ -267,6 +268,7 @@ void usage(enum logcode F)
+@@ -268,6 +269,7 @@ void usage(enum logcode F)
    rprintf(F," -R, --relative              use relative path names\n");
    rprintf(F,"     --no-relative           turn off --relative\n");
    rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");
@@ -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);
-@@ -417,6 +419,7 @@ static struct poptOption long_options[] 
+@@ -419,6 +421,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 },
-@@ -910,6 +913,11 @@ int parse_arguments(int *argc, const cha
+@@ -918,6 +921,11 @@ int parse_arguments(int *argc, const cha
                        batch_name = NULL;
                }
        }
@@ -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");
-@@ -1004,6 +1012,14 @@ int parse_arguments(int *argc, const cha
+@@ -1012,6 +1020,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;
-@@ -1397,6 +1413,11 @@ void server_options(char **args,int *arg
+@@ -1405,6 +1421,11 @@ void server_options(char **args,int *arg
        } else if (keep_partial)
                args[ac++] = "--partial";
  
@@ -101,9 +101,9 @@ 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-01 01:22:59
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806
 +++ rsync.yo   2005-02-22 18:20:24
-@@ -304,6 +304,7 @@ to the detailed description below for a 
+@@ -303,6 +303,7 @@ to the detailed description below for a 
   -R, --relative              use relative path names
       --no-relative           turn off --relative
       --no-implied-dirs       don't send implied dirs with -R