X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6902ed178ba54c8e1c410519f7ee576ddb42554c..7c06e407ecb9c99abce58665f85551d8e99707a9:/options.c diff --git a/options.c b/options.c index bfce8f68..6b3227dd 100644 --- a/options.c +++ b/options.c @@ -123,9 +123,10 @@ static void print_rsync_version(int f) RSYNC_NAME, VERSION, PROTOCOL_VERSION); rprintf(f, "Copyright (C) 1996-2001 by Andrew Tridgell, Paul Mackerras and others\n"); + rprintf(f, "\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); @@ -211,7 +212,7 @@ void usage(enum logcode F) 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=FILE read batch file\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"); @@ -280,7 +281,7 @@ static struct poptOption long_options[] = { {"max-delete", 0, POPT_ARG_INT, &max_delete}, {"timeout", 0, POPT_ARG_INT, &io_timeout}, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir}, - {"compare-dest", 0, POPT_ARG_NONE, &compare_dest}, + {"compare-dest", 0, POPT_ARG_STRING, &compare_dest}, /* TODO: Should this take an optional int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression}, {"daemon", 0, POPT_ARG_NONE, &am_daemon}, @@ -470,7 +471,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case OPT_ADDRESS: { struct in_addr *ia; - if ((ia = ip_address(optarg))) { + if ((ia = ip_address (poptGetOptArg (pc)))) { socket_address = *ia; } }