X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d5d4b282203f9cb06e77e67021ffdd62abb24d89..2a951cd2f9d672aa3b025759c18608f50a6c7767:/options.c diff --git a/options.c b/options.c index 93951176..62b9c092 100644 --- a/options.c +++ b/options.c @@ -212,7 +212,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"); @@ -298,6 +299,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, &global_opts.no_detach}, {"stats", 0, POPT_ARG_NONE, &do_stats}, {"progress", 0, POPT_ARG_NONE, &do_progress}, {"partial", 0, POPT_ARG_NONE, &keep_partial}, @@ -314,8 +316,8 @@ static struct poptOption long_options[] = { {"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, &global_opts.af, AF_INET }, - {0, '6', POPT_ARG_VAL, &global_opts.af, AF_INET6 }, + {0, '4', POPT_ARG_VAL, &global_opts.af_hint, AF_INET }, + {0, '6', POPT_ARG_VAL, &global_opts.af_hint, AF_INET6 }, #endif {0,0,0,0} };