From 655b5cc1987c0368496b2762515376d87626366f Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 7 Mar 2016 01:42:24 -0500 Subject: [PATCH] lttng-relayd: show man page with --help and remove usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- src/bin/lttng-relayd/main.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index cc5009940..b5b56aa01 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -162,24 +162,6 @@ static struct option long_options[] = { static const char *config_ignore_options[] = { "help", "config" }; -/* - * usage function on stderr - */ -static void usage(void) -{ - fprintf(stderr, "Usage: %s OPTIONS\n\nOptions:\n", progname); - fprintf(stderr, " -h, --help Display this usage.\n"); - fprintf(stderr, " -d, --daemonize Start as a daemon.\n"); - fprintf(stderr, " -b, --background Start as a daemon, keeping console open.\n"); - fprintf(stderr, " -C, --control-port URL Control port listening.\n"); - fprintf(stderr, " -D, --data-port URL Data port listening.\n"); - fprintf(stderr, " -L, --live-port URL Live view port listening.\n"); - fprintf(stderr, " -o, --output PATH Output path for traces. Must use an absolute path.\n"); - fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n"); - fprintf(stderr, " -g, --group NAME Specify the tracing group name. (default: tracing)\n"); - fprintf(stderr, " -f --config Load daemon configuration file\n"); -} - /* * Take an option from the getopt output and set it in the right variable to be * used later. @@ -263,7 +245,11 @@ static int set_option(int opt, const char *arg, const char *optname) } break; case 'h': - usage(); + ret = utils_show_man_page(8, "lttng-relayd"); + if (ret) { + ERR("Cannot view man page lttng-relayd(8)"); + perror("exec"); + } exit(EXIT_FAILURE); case 'o': if (lttng_is_setuid_setgid()) { -- 2.34.1