diff mbox

[lttng-tools] Add version info to lttng-relayd help

Message ID 20161020055855.28518-1-wallinux@gmail.com
State Accepted, archived
Headers show

Commit Message

Anders Wallin Oct. 20, 2016, 5:58 a.m. UTC
lttng-relayd man pages states that the option
-V --version is available, but it it's missing in the code

Signed-off-by: Anders Wallin <wallinux at gmail.com>
---
 src/bin/lttng-relayd/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Jérémie Galarneau Nov. 8, 2016, 5:02 p.m. UTC | #1
Merged in master, stable-2.9, stable-2.8 and stable-2.7.

Thanks!
Jérémie

On 20 October 2016 at 01:58, Anders Wallin <wallinux at gmail.com> wrote:
> lttng-relayd man pages states that the option
> -V --version is available, but it it's missing in the code
>
> Signed-off-by: Anders Wallin <wallinux at gmail.com>
> ---
>  src/bin/lttng-relayd/main.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
> index ea46ec7..9c0e2b1 100644
> --- a/src/bin/lttng-relayd/main.c
> +++ b/src/bin/lttng-relayd/main.c
> @@ -161,10 +161,11 @@ static struct option long_options[] = {
>         { "output", 1, 0, 'o', },
>         { "verbose", 0, 0, 'v', },
>         { "config", 1, 0, 'f' },
> +       { "version", 0, 0, 'V' },
>         { NULL, 0, 0, 0, },
>  };
>
> -static const char *config_ignore_options[] = { "help", "config" };
> +static const char *config_ignore_options[] = { "help", "config", "version" };
>
>  /*
>   * Take an option from the getopt output and set it in the right variable to be
> @@ -255,6 +256,9 @@ static int set_option(int opt, const char *arg, const char *optname)
>                         perror("exec");
>                 }
>                 exit(EXIT_FAILURE);
> +       case 'V':
> +               fprintf(stdout, "%s\n", VERSION);
> +               exit(EXIT_SUCCESS);
>         case 'o':
>                 if (lttng_is_setuid_setgid()) {
>                         WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
> --
> 2.10.0
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
diff mbox

Patch

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index ea46ec7..9c0e2b1 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -161,10 +161,11 @@  static struct option long_options[] = {
 	{ "output", 1, 0, 'o', },
 	{ "verbose", 0, 0, 'v', },
 	{ "config", 1, 0, 'f' },
+	{ "version", 0, 0, 'V' },
 	{ NULL, 0, 0, 0, },
 };
 
-static const char *config_ignore_options[] = { "help", "config" };
+static const char *config_ignore_options[] = { "help", "config", "version" };
 
 /*
  * Take an option from the getopt output and set it in the right variable to be
@@ -255,6 +256,9 @@  static int set_option(int opt, const char *arg, const char *optname)
 			perror("exec");
 		}
 		exit(EXIT_FAILURE);
+	case 'V':
+		fprintf(stdout, "%s\n", VERSION);
+		exit(EXIT_SUCCESS);
 	case 'o':
 		if (lttng_is_setuid_setgid()) {
 			WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",