Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3610c45
)
Added the --max-size option.
author
Wayne Davison
<wayned@samba.org>
Thu, 11 Nov 2004 01:45:25 +0000
(
01:45
+0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 11 Nov 2004 01:45:25 +0000
(
01:45
+0000)
options.c
patch
|
blob
|
blame
|
history
diff --git
a/options.c
b/options.c
index
97e1dae
..
fb9dd7b
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-90,6
+90,7
@@
int delete_after = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
int max_delete = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
int max_delete = 0;
+OFF_T max_size = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
@@
-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 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
/** Local address to bind. As a character string because it's
* 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," --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");
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");
@@
-312,7
+315,7
@@
void usage(enum logcode F)
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
enum {OPT_VERSION = 1000, OPT_DAEMON, 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_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
@@
-367,6
+370,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 },
{"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 },
+ {"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 },
{"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 },
@@
-667,6
+671,35
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
read_batch = 1;
break;
read_batch = 1;
break;
+ case OPT_MAX_SIZE:
+ for (arg = max_size_arg; isdigit(*arg); arg++) {}
+ if (*arg == '.')
+ for (arg++; isdigit(*arg); arg++) {}
+ switch (*arg) {
+ case 'k': case 'K':
+ max_size = atof(max_size_arg) * 1024;
+ break;
+ case 'm': case 'M':
+ max_size = atof(max_size_arg) * 1024*1024;
+ break;
+ case 'g': case 'G':
+ max_size = atof(max_size_arg) * 1024*1024*1024;
+ break;
+ case '\0':
+ max_size = atof(max_size_arg);
+ break;
+ default:
+ max_size = 0;
+ break;
+ }
+ if (max_size <= 0) {
+ rprintf(FERROR,
+ "--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;
case OPT_TIMEOUT:
if (io_timeout && io_timeout < select_timeout)
select_timeout = io_timeout;
@@
-1050,6
+1083,11
@@
void server_options(char **args,int *argc)
args[ac++] = arg;
}
args[ac++] = arg;
}
+ if (max_size && am_sender) {
+ args[ac++] = "--max-size";
+ args[ac++] = max_size_arg;
+ }
+
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;