---- generator.c 11 Jun 2004 07:40:51 -0000 1.87
-+++ generator.c 15 Jun 2004 15:35:48 -0000
-@@ -39,6 +39,7 @@ extern int opt_ignore_existing;
+--- orig/generator.c 2004-09-20 19:50:13
++++ generator.c 2004-07-03 20:20:46
+@@ -41,6 +41,7 @@ extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
-@@ -345,6 +346,10 @@ void recv_generator(char *fname, struct
+@@ -339,6 +340,10 @@ static void recv_generator(char *fname,
&& verbose && f_out != -1)
- rprintf(FINFO,"%s/\n",fname);
+ rprintf(FINFO, "%s/\n", safe_fname(fname));
return;
+ } else if (max_size && file->length > max_size) {
+ if (verbose > 1)
}
if (preserve_links && S_ISLNK(file->mode)) {
---- options.c 7 Jun 2004 22:05:22 -0000 1.156
-+++ options.c 15 Jun 2004 15:35:48 -0000
+--- 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;
int opt_ignore_existing = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
-@@ -139,6 +140,7 @@ char *batch_prefix = NULL;
+@@ -140,6 +141,7 @@ char *batch_name = NULL;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
+static char *max_size_arg;
/** Local address to bind. As a character string because it's
- * interpreted by the IPv6 layer: should be a numeric IP4 or ip6
-@@ -310,7 +312,7 @@ void usage(enum logcode F)
+ * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
+@@ -268,6 +270,7 @@ void usage(enum logcode F)
+ rprintf(F," --delete-after receiver deletes after transferring, not before\n");
+ rprintf(F," --ignore-errors delete even if there are I/O errors\n");
+ rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
++ rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
+ rprintf(F," --partial keep partially transferred files\n");
+ rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
+ rprintf(F," --force force deletion of directories even if not empty\n");
+@@ -319,7 +322,7 @@ void usage(enum logcode F)
enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
-@@ -364,6 +366,7 @@ static struct poptOption long_options[]
+@@ -374,6 +377,7 @@ static struct poptOption long_options[]
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
{"block-size", 'B', POPT_ARG_INT, &block_size, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 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 },
-@@ -580,6 +583,32 @@ int parse_arguments(int *argc, const cha
- checksum_seed = FIXED_CHECKSUM_SEED;
+@@ -600,6 +604,33 @@ int parse_arguments(int *argc, const cha
+ read_batch = 1;
break;
+ case OPT_MAX_SIZE:
+ 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;
+ }
case OPT_TIMEOUT:
if (io_timeout && io_timeout < select_timeout)
select_timeout = io_timeout;
-@@ -884,6 +913,11 @@ void server_options(char **args,int *arg
+@@ -989,6 +1020,11 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
+ args[ac++] = max_size_arg;
+ }
+
- if (batch_prefix) {
- char *r_or_w = write_batch ? "write" : "read";
- if (asprintf(&arg, "--%s-batch=%s", r_or_w, batch_prefix) < 0)
+ if (io_timeout) {
+ if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
+ goto oom;
+--- 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
+ --ignore-errors delete even if there are I/O errors
+ --max-delete=NUM don't delete more than NUM files
++ --max-size=SIZE don't transfer any file larger than SIZE
+ --partial keep partially transferred files
+ --partial-dir=DIR put a partially transferred file into DIR
+ --force force deletion of dirs even if not empty
+@@ -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.
+
++dit(bf(--max-size=SIZE)) This tells rsync to avoid transferring any
++file that is larger than the specified SIZE. The SIZE value can be
++suffixed with a letter to indicate a size multiplier (K, M, or G) and
++may be a fractional value (e.g. "--max-size=1.5m").
++
+ dit(bf(--delete)) This tells rsync to delete any files on the receiving
+ side that aren't on the sending side. Files that are excluded from
+ transfer are excluded from being deleted unless you use --delete-excluded.