#endif
int blocking_io=0;
-/** Network address family. **/
-int af = AF_INET;
+/** Global options set from command line. **/
+struct global_opts global_opts;
int read_batch=0; /* dw */
int write_batch=0; /* dw */
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 ";
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");
/* 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},
{"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, &af, AF_INET },
- {0, '6', POPT_ARG_VAL, &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}
};