RSYNC_NAME, VERSION, PROTOCOL_VERSION);
rprintf(f,
"Copyright (C) 1996-2001 by Andrew Tridgell, Paul Mackerras and others\n");
RSYNC_NAME, VERSION, PROTOCOL_VERSION);
rprintf(f,
"Copyright (C) 1996-2001 by Andrew Tridgell, Paul Mackerras and others\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
- "%shard links, %ssymlinks\n\n",
- sizeof(int64) * 8,
+ "%shard links, %ssymlinks, batchfiles\n\n",
+ (int) (sizeof(int64) * 8),
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," --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");
{"address", 0, POPT_ARG_STRING, 0, OPT_ADDRESS},
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir},
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links},
{"address", 0, POPT_ARG_STRING, 0, OPT_ADDRESS},
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir},
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links},
+ {"read-batch", 'f', POPT_ARG_STRING, &batch_ext, 'f'},
+ {"write-batch", 'F', POPT_ARG_NONE, &write_batch, 0},
while ((p = strstr(ref,name))) {
if ((p==ref || p[-1]==' ') &&
(p[len] == ' ' || p[len] == 0)) {
while ((p = strstr(ref,name))) {
if ((p==ref || p[-1]==' ') &&
(p[len] == ' ' || p[len] == 0)) {
/* The context leaks in case of an error, but if there's a
* problem we always exit anyhow. */
/* The context leaks in case of an error, but if there's a
* problem we always exit anyhow. */
- pc = poptGetContext(RSYNC_NAME, *argc, (const char **) *argv,
- long_options, 0);
+ pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0);
"hard links are not supported on this %s\n",
am_server ? "server" : "client");
rprintf(FERROR,"ERROR: hard links not supported on this platform\n");
"hard links are not supported on this %s\n",
am_server ? "server" : "client");
rprintf(FERROR,"ERROR: hard links not supported on this platform\n");
default:
/* FIXME: If --daemon is specified, then errors for later
* parameters seem to disappear. */
default:
/* FIXME: If --daemon is specified, then errors for later
* parameters seem to disappear. */
"%s%s: %s\n",
am_server ? "on remote machine: " : "",
poptBadOption(pc, POPT_BADOPTION_NOALIAS),
"%s%s: %s\n",
am_server ? "on remote machine: " : "",
poptBadOption(pc, POPT_BADOPTION_NOALIAS),
- slprintf(bsize,sizeof(bsize),"-B%d",block_size);
+ snprintf(bsize,sizeof(bsize),"-B%d",block_size);
- slprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete);
+ snprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete);
- slprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout);
+ snprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout);
- slprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit);
+ snprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit);
- slprintf(mwindow,sizeof(mwindow),"--modify-window=%d",
+ snprintf(mwindow,sizeof(mwindow),"--modify-window=%d",