| Message ID | 20161015063823.16638-1-wallinux@gmail.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 15 October 2016 at 02:38, 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 | 15 ++++++++++++++- > 1 file changed, 14 insertions(+), 1 deletion(-) > > diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c > index ea46ec7..34a9ba1 100644 > --- a/src/bin/lttng-relayd/main.c > +++ b/src/bin/lttng-relayd/main.c > @@ -161,10 +161,20 @@ 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" }; > + > +/* > + * Version info on stderr > + */ > +static void version(void) > +{ > + fprintf(stderr, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "\n", > + progname); Please use the short version printout, as done in the session daemon. Also, please output to stdout. See: https://github.com/lttng/lttng-tools/blob/master/src/bin/lttng-sessiond/main.c#L4686 > +} > > /* > * Take an option from the getopt output and set it in the right variable to be > @@ -255,6 +265,9 @@ static int set_option(int opt, const char *arg, const char *optname) > perror("exec"); > } > exit(EXIT_FAILURE); > + case 'V': > + version(); > + exit(EXIT_FAILURE); EXIT_FAILURE -> EXIT_SUCCESS Thanks, Jérémie > 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
Ok, new patch on it's way /Anders Anders Wallin On Wed, Oct 19, 2016 at 10:57 PM, Jérémie Galarneau <jeremie.galarneau at efficios.com> wrote: > On 15 October 2016 at 02:38, 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 | 15 ++++++++++++++- >> 1 file changed, 14 insertions(+), 1 deletion(-) >> >> diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c >> index ea46ec7..34a9ba1 100644 >> --- a/src/bin/lttng-relayd/main.c >> +++ b/src/bin/lttng-relayd/main.c >> @@ -161,10 +161,20 @@ 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" }; >> + >> +/* >> + * Version info on stderr >> + */ >> +static void version(void) >> +{ >> + fprintf(stderr, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "\n", >> + progname); > > Please use the short version printout, as done in the session daemon. > Also, please output to stdout. > > See: > https://github.com/lttng/lttng-tools/blob/master/src/bin/lttng-sessiond/main.c#L4686 > >> +} >> >> /* >> * Take an option from the getopt output and set it in the right variable to be >> @@ -255,6 +265,9 @@ static int set_option(int opt, const char *arg, const char *optname) >> perror("exec"); >> } >> exit(EXIT_FAILURE); >> + case 'V': >> + version(); >> + exit(EXIT_FAILURE); > > EXIT_FAILURE -> EXIT_SUCCESS > > Thanks, > Jérémie > >> 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 > > > > -- > Jérémie Galarneau > EfficiOS Inc. > http://www.efficios.com
diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index ea46ec7..34a9ba1 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -161,10 +161,20 @@ 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" }; + +/* + * Version info on stderr + */ +static void version(void) +{ + fprintf(stderr, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "\n", + progname); +} /* * Take an option from the getopt output and set it in the right variable to be @@ -255,6 +265,9 @@ static int set_option(int opt, const char *arg, const char *optname) perror("exec"); } exit(EXIT_FAILURE); + case 'V': + version(); + exit(EXIT_FAILURE); case 'o': if (lttng_is_setuid_setgid()) { WARN("Getting '%s' argument from setuid/setgid binary refused for security reasons.",
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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)