int always_checksum = 0;
int list_only = 0;
-#define FIXED_CHECKSUM_SEED 32761
-#define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */
-char *batch_prefix = NULL;
+#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
+char *batch_name = NULL;
static int daemon_opt; /* sets am_daemon after option error-reporting */
static int modify_window_set;
/** Local address to bind. As a character string because it's
- * interpreted by the IPv6 layer: should be a numeric IP4 or ip6
+ * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
* address, or a hostname. **/
char *bind_address;
rprintf(F," --log-format=FORMAT log file transfers using specified format\n");
rprintf(F," --password-file=FILE get password from FILE\n");
rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n");
- rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n");
- rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n");
+ rprintf(F," --write-batch=FILE write a batch to FILE\n");
+ rprintf(F," --read-batch=FILE read a batch from FILE\n");
rprintf(F," --checksum-seed=NUM set block/file checksum seed\n");
#ifdef INET6
rprintf(F," -4 --ipv4 prefer IPv4\n");
{"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
- {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 },
- {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 },
+ {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
+ {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
**/
void option_error(void)
{
- int save_daemon = am_daemon;
-
if (!err_buf[0]) {
strcpy(err_buf, "Error parsing options: "
"option may be supported on client but not on server?\n");
}
- rwrite(FLOG, err_buf, strlen(err_buf));
- am_daemon = 0;
rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
- am_daemon = save_daemon;
}
break;
case OPT_WRITE_BATCH:
- /* popt stores the filename in batch_prefix for us */
+ /* batch_name is already set */
write_batch = 1;
- checksum_seed = FIXED_CHECKSUM_SEED;
break;
case OPT_READ_BATCH:
- /* popt stores the filename in batch_prefix for us */
+ /* batch_name is already set */
read_batch = 1;
- checksum_seed = FIXED_CHECKSUM_SEED;
break;
case OPT_TIMEOUT:
"write-batch and read-batch can not be used together\n");
exit_cleanup(RERR_SYNTAX);
}
- if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) {
+ if (write_batch || read_batch) {
+ if (dry_run) {
+ rprintf(FERROR,
+ "--%s-batch cannot be used with --dry_run (-n)\n",
+ write_batch ? "write" : "read");
+ exit_cleanup(RERR_SYNTAX);
+ }
+ if (am_server) {
+ rprintf(FINFO,
+ "ignoring --%s-batch option sent to server\n",
+ write_batch ? "write" : "read");
+ /* We don't actually exit_cleanup(), so that we can
+ * still service older version clients that still send
+ * batch args to server. */
+ read_batch = write_batch = 0;
+ batch_name = NULL;
+ }
+ }
+ if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
rprintf(FERROR,
- "the batch-file prefix must be %d characters or less.\n",
- MAX_BATCH_PREFIX_LEN);
+ "the batch-file name must be %d characters or less.\n",
+ MAX_BATCH_NAME_LEN);
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
- if (do_compression && (write_batch || read_batch)) {
- rprintf(FERROR,
- "compress can not be used with write-batch or read-batch\n");
- exit_cleanup(RERR_SYNTAX);
- }
-
if (archive_mode) {
if (!files_from)
recurse = 1;
args[ac++] = arg;
}
- if (batch_prefix) {
- char *r_or_w = write_batch ? "write" : "read";
- if (asprintf(&arg, "--%s-batch=%s", r_or_w, batch_prefix) < 0)
- goto oom;
- args[ac++] = arg;
- }
-
if (io_timeout) {
if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
goto oom;