Updated.

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

diff --git a/max-size.diff b/max-size.diff
index 7439e53..25a28de 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -19,8 +19,8 @@
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {

---- orig/options.c     2004-08-11 23:42:23
-+++ options.c  2004-07-15 02:34:44
+--- orig/options.c     2004-08-12 18:34:38
++++ options.c  2004-08-13 18:26:04

 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
  int opt_ignore_existing = 0;
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
  int opt_ignore_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 },
    {"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,32 @@ int parse_arguments(int *argc, const cha
+@@ -604,6 +608,33 @@ int parse_arguments(int *argc, const cha

                        read_batch = 1;
                        break;
  
                        read_batch = 1;
                        break;
  


@@ -86,7 +86,8 @@
 +                              break;
 +                      default:
 +                              rprintf(FERROR,
 +                              break;
 +                      default:
 +                              rprintf(FERROR,

-+                                      "--max-size value is invalid.\n");
++                                      "--max-size value is invalid: %s\n",
++                                      max_size_arg);

 +                              exit_cleanup(RERR_SYNTAX);
 +                              break;
 +                      }
 +                              exit_cleanup(RERR_SYNTAX);
 +                              break;
 +                      }


@@ -95,7 +96,7 @@
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;

-@@ -983,6 +1013,11 @@ void server_options(char **args,int *arg
+@@ -983,6 +1014,11 @@ void server_options(char **args,int *arg

                args[ac++] = arg;
        }
  
                args[ac++] = arg;
        }
  


@@ -107,9 +108,9 @@
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;

---- orig/rsync.yo      2004-08-11 17:26:27
+--- orig/rsync.yo      2004-08-13 07:18:59

 +++ rsync.yo   2004-07-03 20:20:46
 +++ rsync.yo   2004-07-03 20:20:46

-@@ -316,6 +316,7 @@ verb(
+@@ -345,6 +345,7 @@ verb(

       --delete-after          receiver deletes after transfer, not before
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files
       --delete-after          receiver deletes after transfer, not before
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files


@@ -117,7 +118,7 @@
       --partial               keep partially transferred files
       --partial-dir=DIR       put a partially transferred file into DIR
       --force                 force deletion of dirs even if not empty
       --partial               keep partially transferred files
       --partial-dir=DIR       put a partially transferred file into DIR
       --force                 force deletion of dirs even if not empty

-@@ -599,6 +600,11 @@ dit(bf(--max-delete=NUM)) This tells rsy
+@@ -628,6 +629,11 @@ dit(bf(--max-delete=NUM)) This tells rsy

  files or directories. This is useful when mirroring very large trees
  to prevent disasters.
  
  files or directories. This is useful when mirroring very large trees
  to prevent disasters.