---- orig/generator.c 2005-04-28 16:26:28
+--- orig/generator.c 2005-08-17 06:45:07
+++ generator.c 2005-04-28 16:19:24
-@@ -58,6 +58,7 @@ extern int make_backups;
+@@ -59,6 +59,7 @@ extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
+extern OFF_T min_size;
extern OFF_T max_size;
- extern int io_timeout;
extern int io_error;
-@@ -837,6 +838,15 @@ static void recv_generator(char *fname,
+ extern int allowed_lull;
+@@ -864,6 +865,15 @@ static void recv_generator(char *fname,
return;
}
if (max_size && file->length > max_size) {
if (verbose > 1) {
if (the_file_list->count == 1)
-@@ -1239,7 +1249,7 @@ void generate_files(int f_out, struct fi
+@@ -1269,7 +1279,7 @@ void generate_files(int f_out, struct fi
phase++;
csum_length = SUM_LENGTH;
+ only_existing = min_size = max_size = opt_ignore_existing = 0;
update_only = always_checksum = size_only = 0;
ignore_times = 1;
- make_backups = 0; /* avoid a duplicate backup for inplace processing */
---- orig/options.c 2005-04-28 16:11:43
-+++ options.c 2005-04-28 16:20:41
+ if (append_mode) /* resend w/o append mode */
+--- orig/options.c 2005-08-27 21:11:26
++++ options.c 2005-08-27 21:23:36
@@ -98,6 +98,7 @@ int only_existing = 0;
int opt_ignore_existing = 0;
int need_messages_from_generator = 0;
OFF_T max_size = 0;
int ignore_errors = 0;
int modify_window = 0;
-@@ -166,7 +167,7 @@ static int modify_window_set;
- static int itemize_changes = 0;
+@@ -167,7 +168,7 @@ static int itemize_changes = 0;
static int refused_delete, refused_archive_part;
static int refused_partial, refused_progress, refused_delete_before;
+ static int refused_inplace;
-static char *max_size_arg;
+static char *min_size_arg, *max_size_arg;
static char partialdir_for_delayupdate[] = ".~tmp~";
/** Local address to bind. As a character string because it's
-@@ -307,6 +308,7 @@ void usage(enum logcode F)
+@@ -308,6 +309,7 @@ void usage(enum logcode F)
rprintf(F," --ignore-errors delete even if there are I/O errors\n");
rprintf(F," --force force deletion of directories even if not empty\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");
-@@ -364,7 +366,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -362,7 +364,7 @@ void usage(enum logcode F)
+
+ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH,
-- OPT_TIMEOUT, OPT_MAX_SIZE,
-+ OPT_TIMEOUT, OPT_MIN_SIZE, OPT_MAX_SIZE,
+- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
++ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
- static struct poptOption long_options[] = {
-@@ -427,6 +429,7 @@ static struct poptOption long_options[]
- {"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 },
+@@ -417,6 +419,7 @@ static struct poptOption long_options[]
+ {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
+ {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
+ {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
+ {"min-size", 0, POPT_ARG_STRING, &min_size_arg, OPT_MIN_SIZE, 0, 0 },
{"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
- {"timeout", 0, POPT_ARG_INT, &io_timeout, OPT_TIMEOUT, 0, 0 },
- {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -835,6 +838,15 @@ int parse_arguments(int *argc, const cha
+ {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
+ {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
+@@ -874,6 +877,15 @@ int parse_arguments(int *argc, const cha
read_batch = 1;
break;
case OPT_MAX_SIZE:
if ((max_size = parse_size_arg(max_size_arg)) <= 0) {
snprintf(err_buf, sizeof err_buf,
-@@ -1352,6 +1364,11 @@ void server_options(char **args,int *arg
+@@ -1395,6 +1407,11 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
if (max_size && am_sender) {
args[ac++] = "--max-size";
args[ac++] = max_size_arg;
---- orig/rsync.yo 2005-04-28 15:56:50
-+++ rsync.yo 2005-04-28 15:13:29
-@@ -350,6 +350,7 @@ to the detailed description below for a
+--- orig/rsync.yo 2005-08-27 21:05:12
++++ rsync.yo 2005-05-06 19:12:35
+@@ -342,6 +342,7 @@ to the detailed description below for a
--ignore-errors delete even if there are I/O errors
--force force deletion of dirs even if not empty
--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
-@@ -766,6 +767,13 @@ dit(bf(--max-delete=NUM)) This tells rsy
+@@ -794,10 +795,16 @@ dit(bf(--max-delete=NUM)) This tells rsy
files or directories (NUM must be non-zero).
This is useful when mirroring very large trees to prevent disasters.
+dit(bf(--min-size=SIZE)) This tells rsync to avoid transferring any
-+file that is smaller 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. "bf(--max-size=1.5m)").
-+This can help in not transferring small junk files.
-+This only affects regular files, not e.g. device nodes or symbolic links.
++file that is smaller than the specified SIZE, which can help in not
++transferring small, junk files.
++
++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. "bf(--min-size=2.5k)").
+
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
+-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. "bf(--max-size=1.5m)").
++file that is larger than the specified SIZE. See the bf(--min-size)
++option for a description of SIZE.
+
+ dit(bf(-B, --block-size=BLOCKSIZE)) This forces the block size used in
+ the rsync algorithm to a fixed value. It is normally selected based on
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff