From: wallinux@gmail.com (Anders Wallin)
Subject: [lttng-dev] [PATCH lttng-tools] Add version info to lttng-relayd help
Date: Thu, 20 Oct 2016 07:58:35 +0200 [thread overview]
Message-ID: <CAF2baFchOgiXWY9hYC9sYVjqOW2M9mV-JMAT2i8EjDu1mgajew@mail.gmail.com> (raw)
In-Reply-To: <CA+jJMxtJf-_C-mT2=PLypZTPzxNem41h5yVHXKnS_h5-aEu3ww@mail.gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2400 bytes --]
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
next prev parent reply other threads:[~2016-10-20 5:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-15 6:38 Anders Wallin
2016-10-19 20:57 ` Jérémie Galarneau
2016-10-20 5:58 ` Anders Wallin [this message]
2016-10-20 5:58 Anders Wallin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAF2baFchOgiXWY9hYC9sYVjqOW2M9mV-JMAT2i8EjDu1mgajew@mail.gmail.com \
--to=wallinux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox