#endif
int blocking_io=0;
+int read_batch=0; /* dw */
+int write_batch=0; /* dw */
+
char *backup_suffix = BACKUP_SUFFIX;
char *tmpdir = NULL;
char *compare_dest = NULL;
int always_checksum = 0;
int list_only = 0;
+char *batch_ext = NULL;
+
static int modify_window_set;
RSYNC_NAME, VERSION, PROTOCOL_VERSION);
rprintf(f,
"Copyright (C) 1996-2001 by Andrew Tridgell, Paul Mackerras and others\n");
+ rprintf(f, "<http://rsync.samba.org/>\n");
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),
got_socketpair,
hardlinks, links);
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," -f --read-batch=EXT read batch file\n");
+ rprintf(F," -F --write-batch write batch file\n");
rprintf(F," -h, --help show this help screen\n");
rprintf(F,"\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},
+ {"read-batch", 'f', POPT_ARG_STRING, &batch_ext, 'f'},
+ {"write-batch", 'F', POPT_ARG_NONE, &write_batch, 0},
{0,0,0,0}
};
-
static char err_buf[100];
case OPT_ADDRESS:
{
struct in_addr *ia;
- if ((ia = ip_address(optarg))) {
+ if ((ia = ip_address (poptGetOptArg (pc)))) {
socket_address = *ia;
}
}
break;
+ case 'f':
+ /* The filename is stored for us by popt */
+ read_batch = 1;
+ break;
+
default:
/* FIXME: If --daemon is specified, then errors for later
* parameters seem to disappear. */
static char mdelete[30];
static char mwindow[30];
static char bw[50];
+ static char fext[20]; /* dw */
int i, x;
argstr[x++] = 'S';
if (do_compression)
argstr[x++] = 'z';
+ if (write_batch)
+ argstr[x++] = 'F'; /* dw */
/* this is a complete hack - blame Rusty
snprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete);
args[ac++] = mdelete;
}
+
+ if (batch_ext != NULL) {
+ sprintf(fext,"-f%s",batch_ext);
+ args[ac++] = fext;
+ }
if (io_timeout) {
snprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout);