The compare_dest variable changed.

[rsync/rsync.git] / options.c

diff --git a/options.c b/options.c
index 97e1dae..3c1864a 100644 (file)
--- a/options.c
+++ b/options.c
@@ -84,12 +84,14 @@ int keep_partial = 0;
 int safe_symlinks = 0;
 int copy_unsafe_links = 0;
 int size_only = 0;
+int daemon_bwlimit = 0;
 int bwlimit = 0;
 size_t bwlimit_writemax = 0;
 int delete_after = 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;
@@ -140,6 +142,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
@@ -268,6 +271,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");
@@ -312,7 +316,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,
-      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[] = {
@@ -367,6 +371,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 },
+  {"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 },
@@ -411,6 +416,7 @@ static void daemon_usage(enum logcode F)
 
   rprintf(F,"\nUsage: rsync --daemon [OPTION]...\n");
   rprintf(F,"     --address=ADDRESS       bind to the specified address\n");
+  rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
   rprintf(F,"     --config=FILE           specify alternate rsyncd.conf file\n");
   rprintf(F,"     --no-detach             do not detach from the parent\n");
   rprintf(F,"     --port=PORT             specify alternate rsyncd port number\n");
@@ -427,6 +433,7 @@ static void daemon_usage(enum logcode F)
 static struct poptOption long_daemon_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
+  {"bwlimit",          0,  POPT_ARG_INT,    &daemon_bwlimit, 0, 0, 0 },
   {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
   {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
 #ifdef INET6
@@ -544,6 +551,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        /* The context leaks in case of an error, but if there's a
         * problem we always exit anyhow. */
        pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0);
+       poptReadDefaultConfig(pc, 0);
 
        while ((opt = poptGetNextOpt(pc)) != -1) {
                /* most options are handled automatically by popt;
@@ -667,6 +675,35 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        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;
@@ -864,6 +901,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        if (do_progress && !verbose)
                verbose = 1;
 
+       if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
+               bwlimit = daemon_bwlimit;
        if (bwlimit) {
                bwlimit_writemax = (size_t)bwlimit * 128;
                if (bwlimit_writemax < 512)
@@ -1050,6 +1089,11 @@ void server_options(char **args,int *argc)
                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;