[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Fri Jul 10 20:08:06 UTC 2020
The branch, master has been updated
via 66ca4fc9 Allow --block-size's size to have a suffix.
from 7d63f8b2 Add missing "M" in SIZE suffixes; mention bytes are the default.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 66ca4fc97bcedb7376dda67b8d07df280eaf462a
Author: Wayne Davison <wayne at opencoder.net>
Date: Fri Jul 10 12:54:33 2020 -0700
Allow --block-size's size to have a suffix.
Change the block_size global to be an int32.
-----------------------------------------------------------------------
Summary of changes:
NEWS.md | 2 ++
generator.c | 2 +-
options.c | 72 +++++++++++++++++++++++++++++++++++++------------------------
rsync.1.md | 3 +++
util2.c | 2 ++
5 files changed, 52 insertions(+), 29 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS.md b/NEWS.md
index d1ba6c5c..9d6a2459 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -15,6 +15,8 @@
- Allow `--max-alloc=0` to specify unlimited.
+ - Allow `--block-size=SIZE` to specify the size using a suffix such as "K".
+
- The name of the id 0 user & group is now sent to the receiver along with the
other uer/group names in the transfer instead of assuming that both sides
have the same id-0 names.
diff --git a/generator.c b/generator.c
index 23a2eaff..adb3307c 100644
--- a/generator.c
+++ b/generator.c
@@ -84,7 +84,7 @@ extern int list_only;
extern int read_batch;
extern int write_batch;
extern int safe_symlinks;
-extern long block_size; /* "long" because popt can't set an int32. */
+extern int32 block_size;
extern int unsort_ndx;
extern int max_delete;
extern int force_delete;
diff --git a/options.c b/options.c
index e6302c93..eab64b61 100644
--- a/options.c
+++ b/options.c
@@ -128,7 +128,7 @@ int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
int delay_updates = 0;
-long block_size = 0; /* "long" because popt can't set an int32. */
+int32 block_size = 0;
char *skip_compress = NULL;
char *copy_as = NULL;
item_list dparam_list = EMPTY_ITEM_LIST;
@@ -776,7 +776,7 @@ enum {OPT_SERVER = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
- OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG,
+ OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG, OPT_BLOCK_SIZE,
OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT,
OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
OPT_REFUSED_BASE = 9000};
@@ -928,7 +928,7 @@ static struct poptOption long_options[] = {
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"cc", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
- {"block-size", 'B', POPT_ARG_LONG, &block_size, 0, 0, 0 },
+ {"block-size", 'B', POPT_ARG_STRING, 0, OPT_BLOCK_SIZE, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -1253,11 +1253,12 @@ static int count_args(const char **argv)
/* If the size_arg is an invalid string or the value is < min_value, an error
* is put into err_buf & the return is -1. Note that this parser does NOT
* support negative numbers, so a min_value < 0 doesn't make any sense. */
-static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0)
+static ssize_t parse_size_arg(const char *size_arg, char def_suf, const char *opt_name,
+ ssize_t min_value, ssize_t max_value, BOOL unlimited_0)
{
- int reps, mult;
- const char *arg, *err = "invalid";
- ssize_t size = 1;
+ int reps, mult, len;
+ const char *arg, *err = "invalid", *min_max = NULL;
+ ssize_t limit = -1, size = 1;
for (arg = size_arg; isDigit(arg); arg++) {}
if (*arg == '.')
@@ -1299,14 +1300,29 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name
size += atoi(arg), arg += 2;
if (*arg)
goto failure;
- if (size < min_value && (!allow_0 || size != 0)) {
- err = size < 0 ? "too big" : "too small";
+ if (size < 0 || (max_value >= 0 && size > max_value)) {
+ err = "too large";
+ min_max = "max";
+ limit = max_value;
+ goto failure;
+ }
+ if (size < min_value && (!unlimited_0 || size != 0)) {
+ err = "too small";
+ min_max = "min";
+ limit = min_value;
goto failure;
}
return size;
failure:
- snprintf(err_buf, sizeof err_buf, "--%s value is %s: %s\n", opt_name, err, size_arg);
+ len = snprintf(err_buf, sizeof err_buf - 1, "--%s=%s is %s", opt_name, size_arg, err);
+ if (min_max && limit >= 0 && len < (int)sizeof err_buf - 10) {
+ len += snprintf(err_buf + len, sizeof err_buf - len - 1, " (%s: %s%s)",
+ min_max, do_big_num(limit, 3, NULL),
+ unlimited_0 && min_max[1] == 'i' ? " or 0 for unlimited" : "");
+ }
+ err_buf[len] = '\n';
+ err_buf[len+1] = '\0';
return -1;
}
@@ -1682,20 +1698,33 @@ int parse_arguments(int *argc_p, const char ***argv_p)
#endif
break;
+ case OPT_BLOCK_SIZE: {
+ /* We may not know the real protocol_version at this point if this is the client
+ * option parsing, but we still want to check it so that the client can specify
+ * a --protocol=29 option with a larger block size. */
+ int max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE;
+ ssize_t size;
+ arg = poptGetOptArg(pc);
+ if ((size = parse_size_arg(arg, 'b', "block-size", 0, max_blength, False)) < 0)
+ return 0;
+ block_size = (int32)size;
+ break;
+ }
+
case OPT_MAX_SIZE:
- if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0)
+ if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, -1, False)) < 0)
return 0;
max_size_arg = num_to_byte_string(max_size);
break;
case OPT_MIN_SIZE:
- if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0)
+ if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, -1, False)) < 0)
return 0;
min_size_arg = num_to_byte_string(min_size);
break;
case OPT_BWLIMIT: {
- ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True);
+ ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, -1, True);
if (size < 0)
return 0;
bwlimit_arg = num_to_byte_string(size);
@@ -1889,7 +1918,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
max_alloc_arg = NULL;
}
if (max_alloc_arg) {
- ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, True);
+ ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, -1, True);
if (size < 0)
return 0;
max_alloc = size;
@@ -2037,19 +2066,6 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
#endif
- if (block_size) {
- /* We may not know the real protocol_version at this point if this is the client
- * option parsing, but we still want to check it so that the client can specify
- * a --protocol=29 option with a larger block size. */
- int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE;
-
- if (block_size > max_blength) {
- snprintf(err_buf, sizeof err_buf,
- "--block-size=%lu is too large (max: %u)\n", block_size, max_blength);
- return 0;
- }
- }
-
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
@@ -2675,7 +2691,7 @@ void server_options(char **args, int *argc_p)
}
if (block_size) {
- if (asprintf(&arg, "-B%lu", block_size) < 0)
+ if (asprintf(&arg, "-B%u", block_size) < 0)
goto oom;
args[ac++] = arg;
}
diff --git a/rsync.1.md b/rsync.1.md
index 229eb905..8bca5e33 100644
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -1788,6 +1788,9 @@ your home directory (remove the '=' for that).
fixed value. It is normally selected based on the size of each file being
updated. See the technical report for details.
+ Beginning in 3.2.3 the SIZE can be specified with a suffix as detailed in
+ the `--max-size` option. Older versions only accepted a byte count.
+
0. `--rsh=COMMAND`, `-e`
This option allows you to choose an alternative remote shell program to use
diff --git a/util2.c b/util2.c
index e7c70c1f..9566b8db 100644
--- a/util2.c
+++ b/util2.c
@@ -77,6 +77,8 @@ char *num_to_byte_string(ssize_t num)
char buf[128], *s = buf + sizeof buf - 1;
*s = '\0';
+ if (!num)
+ *--s = '0';
while (num) {
*--s = (char)(num % 10) + '0';
num /= 10;
--
The rsync repository.
More information about the rsync-cvs
mailing list