X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/040f7b659595c500a5faf06032be066bbe195ea6..1db8b61de7fd31b9c7b02918e6c194255979f030:/options.c diff --git a/options.c b/options.c index 2b45512a..8893195a 100644 --- a/options.c +++ b/options.c @@ -52,7 +52,7 @@ int io_error = 0; int read_only = 0; int module_id = -1; int am_server = 0; -int am_sender=0; +int am_sender = 0; int recurse = 0; int am_daemon=0; int do_stats=0; @@ -74,8 +74,21 @@ int modify_window=0; #endif int blocking_io=0; -int read_batch=0; /* dw */ -int write_batch=0; /* dw */ +/** Network address family. **/ +#ifdef INET6 +int default_af_hint = 0; /* Any protocol */ +#else +int default_af_hint = AF_INET; /* Must use IPv4 */ +#endif + +/** Do not go into the background when run as --daemon. Good + * for debugging and required for running as a service on W32, + * or under Unix process-monitors. **/ +int no_detach = 0; + + +int read_batch=0; +int write_batch=0; char *backup_suffix = BACKUP_SUFFIX; char *tmpdir = NULL; @@ -97,15 +110,18 @@ char *batch_ext = NULL; static int modify_window_set; - -struct in_addr socket_address = {INADDR_ANY}; +/** Local address to bind. As a character string because it's + * interpreted by the IPv6 layer: should be a numeric IP4 or ip6 + * address, or a hostname. **/ +char *bind_address; -static void print_rsync_version(int f) +static void print_rsync_version(enum logcode f) { char const *got_socketpair = "no "; char const *hardlinks = "no "; char const *links = "no "; + char const *ipv6 = "no "; #ifdef HAVE_SOCKETPAIR got_socketpair = ""; @@ -119,16 +135,19 @@ static void print_rsync_version(int f) links = ""; #endif +#if INET6 + ipv6 = ""; +#endif + rprintf(f, "%s version %s protocol version %d\n", - RSYNC_NAME, VERSION, PROTOCOL_VERSION); + RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, "Copyright (C) 1996-2001 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %ssymlinks, batchfiles\n\n", - (int) (sizeof(int64) * 8), - got_socketpair, - hardlinks, links); + "%shard links, %ssymlinks, batchfiles, %sIPv6\n\n", + (int) (sizeof(OFF_T) * 8), + got_socketpair, hardlinks, links, ipv6); #ifdef NO_INT64 rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); @@ -162,8 +181,8 @@ void usage(enum logcode F) rprintf(F," --backup-dir make backups into this directory\n"); rprintf(F," --suffix=SUFFIX override backup suffix\n"); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); - rprintf(F," -l, --links preserve soft links\n"); - rprintf(F," -L, --copy-links treat soft links like regular files\n"); + rprintf(F," -l, --links copy symlinks as symlinks\n"); + rprintf(F," -L, --copy-links copy the referent of symlinks\n"); rprintf(F," --copy-unsafe-links copy links outside the source tree\n"); rprintf(F," --safe-links ignore links outside the destination tree\n"); rprintf(F," -H, --hard-links preserve hard links\n"); @@ -203,7 +222,8 @@ void usage(enum logcode F) rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n"); rprintf(F," --version print version number\n"); rprintf(F," --daemon run as a rsync daemon\n"); - rprintf(F," --address bind to the specified address\n"); + rprintf(F," --no-detach do not detach from the parent\n"); + rprintf(F," --address=ADDRESS bind to the specified address\n"); rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); rprintf(F," --port=PORT specify alternate rsyncd port number\n"); rprintf(F," --blocking-io use blocking IO for the remote shell\n"); @@ -215,6 +235,10 @@ void usage(enum logcode F) 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"); +#ifdef INET6 + rprintf(F," -4 prefer IPv4\n"); + rprintf(F," -6 prefer IPv6\n"); +#endif rprintf(F,"\n"); @@ -285,6 +309,7 @@ static struct poptOption long_options[] = { /* 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}, + {"no-detach", 0, POPT_ARG_NONE, &no_detach}, {"stats", 0, POPT_ARG_NONE, &do_stats}, {"progress", 0, POPT_ARG_NONE, &do_progress}, {"partial", 0, POPT_ARG_NONE, &keep_partial}, @@ -295,14 +320,19 @@ static struct poptOption long_options[] = { {"port", 0, POPT_ARG_INT, &rsync_port}, {"log-format", 0, POPT_ARG_STRING, &log_format}, {"bwlimit", 0, POPT_ARG_INT, &bwlimit}, - {"address", 0, POPT_ARG_STRING, 0, OPT_ADDRESS}, + {"address", 0, POPT_ARG_STRING, &bind_address, 0}, {"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}, +#ifdef INET6 + {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET }, + {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 }, +#endif {0,0,0,0} }; + static char err_buf[100]; @@ -473,14 +503,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) keep_partial = 1; break; - case OPT_ADDRESS: - { - struct in_addr *ia; - if ((ia = ip_address (poptGetOptArg (pc)))) { - socket_address = *ia; - } - } - break; case 'f': /* The filename is stored for us by popt */