Need to make sure that the destination file doesn't exist before we

[rsync/rsync-patches.git] / max-size.diff

diff --git a/max-size.diff b/max-size.diff
index 25a28de..b32097b 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -1,6 +1,6 @@
---- orig/generator.c   2004-08-05 18:24:21
+--- orig/generator.c   2004-09-20 19:50:13
 +++ generator.c        2004-07-03 20:20:46
-@@ -39,6 +39,7 @@ extern int opt_ignore_existing;
+@@ -41,6 +41,7 @@ extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
  extern int size_only;
@@ -8,7 +8,7 @@
  extern int io_timeout;
  extern int protocol_version;
  extern int always_checksum;
-@@ -333,6 +334,10 @@ static void recv_generator(char *fname, 
+@@ -339,6 +340,10 @@ static void recv_generator(char *fname, 
                    && verbose && f_out != -1)
                        rprintf(FINFO, "%s/\n", safe_fname(fname));
                return;
@@ -19,7 +19,7 @@
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {
---- orig/options.c     2004-08-12 18:34:38
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-08-13 18:26:04
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
@@ -62,7 +62,7 @@
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
-@@ -604,6 +608,33 @@ int parse_arguments(int *argc, const cha
+@@ -600,6 +604,33 @@ int parse_arguments(int *argc, const cha
                        read_batch = 1;
                        break;
  
@@ -96,7 +96,7 @@
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;
-@@ -983,6 +1014,11 @@ void server_options(char **args,int *arg
+@@ -989,6 +1020,11 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -108,7 +108,7 @@
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
---- orig/rsync.yo      2004-08-13 07:18:59
+--- orig/rsync.yo      2004-09-20 05:10:48
 +++ rsync.yo   2004-07-03 20:20:46
 @@ -345,6 +345,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before