X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3b4b1984ef280e966b62d37817dbc720c38becd7..f6e09367a702252982147334bdc844a7812ceb2e:/options.c

diff --git a/options.c b/options.c
index e6722623..3376cbc9 100644
--- a/options.c
+++ b/options.c
@@ -126,7 +126,7 @@ static void print_rsync_version(int f)
 	rprintf(f, "<http://rsync.samba.org/>\n");
         rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
                 "%shard links, %ssymlinks, batchfiles\n\n",
-                sizeof(int64) * 8,
+                (int) (sizeof(int64) * 8),
                 got_socketpair,
                 hardlinks, links);
 
@@ -274,14 +274,14 @@ static struct poptOption long_options[] = {
   {"archive",         'a', POPT_ARG_NONE,   0,               'a'}, 
   {"server",           0,  POPT_ARG_NONE,   &am_server},
   {"sender",           0,  POPT_ARG_NONE,   0,               OPT_SENDER},
-  {"recurse",         'r', POPT_ARG_NONE,   &recurse},
+  {"recursive",       'r', POPT_ARG_NONE,   &recurse},
   {"relative",        'R', POPT_ARG_NONE,   &relative_paths},
   {"rsh",             'e', POPT_ARG_STRING, &shell_cmd},
   {"block-size",      'B', POPT_ARG_INT,    &block_size},
   {"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},
@@ -471,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;
 				}
 			}