From pbrezina at redhat.com Mon Nov 9 06:17:00 2015 Content-Type: multipart/mixed; boundary="===============2330541331268421246==" MIME-Version: 1.0 From: =?utf-8?q?Pavel_B=C5=99ezina_=3Cpbrezina_at_redhat=2Ecom=3E?= To: sssd-devel at lists.fedorahosted.org Subject: Re: [SSSD] [PATCH] sss_override: document --debug options Date: Tue, 25 Aug 2015 13:36:24 +0200 Message-ID: <55DC5338.5090504@redhat.com> In-Reply-To: 55DC5237.5000402@redhat.com --===============2330541331268421246== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable On 08/25/2015 01:32 PM, Petr Cech wrote: > On 08/25/2015 01:00 PM, Pavel B=C5=99ezina wrote: >> https://fedorahosted.org/sssd/ticket/2758 >> > Hi Pavel, > I have 3 formal comments to coding style. > Now I am running the tests. I will send you mail > with results soon. > Petr >> 0001-sss_override-document-debug-options.patch >> >> >> From f181b0a94863f082abaf074a0940e83fbf1c89b1 Mon Sep 17 00:00:00 2001 >> From: =3D?UTF-8?q?Pavel=3D20B=3DC5=3D99ezina?=3D >> Date: Tue, 25 Aug 2015 12:58:45 +0200 >> Subject: [PATCH] sss_override: document --debug options >> >> Resolves: >> https://fedorahosted.org/sssd/ticket/2758 >> --- >> src/man/sss_override.8.xml | 18 +++++++++++++++++- >> src/tools/common/sss_tools.c | 25 +++++++++++++++++++++---- >> 2 files changed, 38 insertions(+), 5 deletions(-) >> >> diff --git a/src/man/sss_override.8.xml b/src/man/sss_override.8.xml >> index d289f5b7dfa7fbd328831b4c71d45b4c555225cf..3db8cbe05322ddf662faaa48= 10cd3bf6b25f8883 100644 >> --- a/src/man/sss_override.8.xml >> +++ b/src/man/sss_override.8.xml >> @@ -38,7 +38,7 @@ >> all local overrides are lost. >> >> >> - >> + > ^^^^ > There are 4 trailing white spaces. Fixed. >> >> AVAILABLE COMMANDS >> >> @@ -189,6 +189,22 @@ >> >> >> >> + > ^^^^ > There are 4 trailing white spaces too. Fixed. >> + >> + COMMON OPTIONS >> + >> + Those options are available with all commands. >> + >> + >> + >> + >> + , >> + LEVEL >> + >> + >> + >> + >> + >> >> >> >> diff --git a/src/tools/common/sss_tools.c b/src/tools/common/sss_tools.c >> index 6bbce3a25ddddc0b23ebc108a917a38e94981b65..3e732a3411494262ea34a1e5= c332e86f5128e771 100644 >> --- a/src/tools/common/sss_tools.c >> +++ b/src/tools/common/sss_tools.c >> @@ -36,6 +36,13 @@ struct sss_cmdline { >> const char **argv; >> }; >> >> +static void sss_tool_print_common_opts(void) >> +{ >> + fprintf(stderr, _("Common options:\n")); >> + fprintf(stderr, " -d, --debug=3DINT %s\n", >> + _("Enable debug at level")); > I'm not sure, but is it habbit to indent to '('? > I mean: > > || + fprintf(stderr, " -d, --debug=3DINT %s\n", > || + _("Enable debug at level")); I tend to indent to format specifier if possible, so format and data = remains together. > >> +} >> + >> static void sss_tool_common_opts(struct sss_tool_ctx *tool_ctx, >> int *argc, const char **argv) >> { >> @@ -201,6 +208,9 @@ int sss_tool_usage(const char *tool_name, >> fprintf(stderr, "* %s\n", commands[i].command); >> } >> >> + fprintf(stderr, _("\n")); >> + sss_tool_print_common_opts(); >> + >> return EXIT_FAILURE; >> } >> >> @@ -237,6 +247,13 @@ int sss_tool_route(int argc, const char **argv, >> return sss_tool_usage(argv[0], commands); >> } >> >> +static void sss_tool_popt_print_help(poptContext pc) >> +{ >> + poptPrintHelp(pc, stderr, 0); >> + fprintf(stderr, "\n"); >> + sss_tool_print_common_opts(); >> +} >> + >> int sss_tool_popt_ex(struct sss_cmdline *cmdline, >> struct poptOption *options, >> enum sss_tool_opt require_option, >> @@ -286,7 +303,7 @@ int sss_tool_popt_ex(struct sss_cmdline *cmdline, >> } else { >> fprintf(stderr, _("Invalid option %s: %s\n\n"), >> poptBadOption(pc, 0), poptStrerror(ret)); >> - poptPrintHelp(pc, stderr, 0); >> + sss_tool_popt_print_help(pc); >> ret =3D EXIT_FAILURE; >> goto done; >> } >> @@ -297,7 +314,7 @@ int sss_tool_popt_ex(struct sss_cmdline *cmdline, >> *_fopt =3D poptGetArg(pc); >> if (*_fopt =3D=3D NULL) { >> fprintf(stderr, _("Missing option: %s\n\n"), fopt_help); >> - poptPrintHelp(pc, stderr, 0); >> + sss_tool_popt_print_help(pc); >> ret =3D EXIT_FAILURE; >> goto done; >> } >> @@ -305,7 +322,7 @@ int sss_tool_popt_ex(struct sss_cmdline *cmdline, >> /* No more arguments expected. If something follows it is an e= rror. */ >> if (poptGetArg(pc)) { >> fprintf(stderr, _("Only one free argument is expected!\n\n= ")); >> - poptPrintHelp(pc, stderr, 0); >> + sss_tool_popt_print_help(pc); >> ret =3D EXIT_FAILURE; >> goto done; >> } >> @@ -315,7 +332,7 @@ int sss_tool_popt_ex(struct sss_cmdline *cmdline, >> if (require_option =3D=3D SSS_TOOL_OPT_REQUIRED >> && ((_fopt !=3D NULL && cmdline->argc < 2) || cmdline->arg= c < 1)) { >> fprintf(stderr, _("At least one option is required!\n\n")); >> - poptPrintHelp(pc, stderr, 0); >> + sss_tool_popt_print_help(pc); >> ret =3D EXIT_FAILURE; >> goto done; >> } >> -- 2.1.0 >> > > > > _______________________________________________ > sssd-devel mailing list > sssd-devel(a)lists.fedorahosted.org > https://lists.fedorahosted.org/mailman/listinfo/sssd-devel > --===============2330541331268421246== Content-Type: text/x-patch MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-sss_override-document-debug-options.patch" RnJvbSAxMGViMzVhNzBkNjExMzJhOGJjMTZlZjJmNzQzMjZkMDdjMmFlM2RlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiA9P1VURi04P3E/UGF2ZWw9MjBCPUM1PTk5ZXppbmE/PSA8cGJy ZXppbmFAcmVkaGF0LmNvbT4KRGF0ZTogVHVlLCAyNSBBdWcgMjAxNSAxMjo1ODo0NSArMDIwMApT dWJqZWN0OiBbUEFUQ0hdIHNzc19vdmVycmlkZTogZG9jdW1lbnQgLS1kZWJ1ZyBvcHRpb25zCgpS ZXNvbHZlczoKaHR0cHM6Ly9mZWRvcmFob3N0ZWQub3JnL3Nzc2QvdGlja2V0LzI3NTgKLS0tCiBz cmMvbWFuL3Nzc19vdmVycmlkZS44LnhtbCAgIHwgMTYgKysrKysrKysrKysrKysrKwogc3JjL3Rv b2xzL2NvbW1vbi9zc3NfdG9vbHMuYyB8IDI1ICsrKysrKysrKysrKysrKysrKysrKy0tLS0KIDIg ZmlsZXMgY2hhbmdlZCwgMzcgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9zcmMvbWFuL3Nzc19vdmVycmlkZS44LnhtbCBiL3NyYy9tYW4vc3NzX292ZXJyaWRlLjgu eG1sCmluZGV4IGQyODlmNWI3ZGZhN2ZiZDMyODgzMWI0YzcxZDQ1YjRjNTU1MjI1Y2YuLmMyZWM1 ZGQ0MTcwM2M3MjcyYWNmN2M5ZDJjMzBmMjAzNTEwOTk3OTEgMTAwNjQ0Ci0tLSBhL3NyYy9tYW4v c3NzX292ZXJyaWRlLjgueG1sCisrKyBiL3NyYy9tYW4vc3NzX292ZXJyaWRlLjgueG1sCkBAIC0x OTAsNiArMTkwLDIyIEBACiAgICAgICAgIDwvdmFyaWFibGVsaXN0PgogICAgIDwvcmVmc2VjdDE+ CiAKKyAgICA8cmVmc2VjdDEgaWQ9J29wdGlvbnMnPgorICAgICAgICA8dGl0bGU+Q09NTU9OIE9Q VElPTlM8L3RpdGxlPgorICAgICAgICA8cGFyYT4KKyAgICAgICAgICAgIFRob3NlIG9wdGlvbnMg YXJlIGF2YWlsYWJsZSB3aXRoIGFsbCBjb21tYW5kcy4KKyAgICAgICAgPC9wYXJhPgorICAgICAg ICA8dmFyaWFibGVsaXN0IHJlbWFwPSdJUCc+CisgICAgICAgICAgICA8dmFybGlzdGVudHJ5Pgor ICAgICAgICAgICAgICAgIDx0ZXJtPgorICAgICAgICAgICAgICAgICAgICA8b3B0aW9uPi1kPC9v cHRpb24+LDxvcHRpb24+LS1kZWJ1Zzwvb3B0aW9uPgorICAgICAgICAgICAgICAgICAgICA8cmVw bGFjZWFibGU+TEVWRUw8L3JlcGxhY2VhYmxlPgorICAgICAgICAgICAgICAgIDwvdGVybT4KKyAg ICAgICAgICAgICAgICA8eGk6aW5jbHVkZSB4bWxuczp4aT0iaHR0cDovL3d3dy53My5vcmcvMjAw MS9YSW5jbHVkZSIgaHJlZj0iaW5jbHVkZS9kZWJ1Z19sZXZlbHMueG1sIiAvPgorICAgICAgICAg ICAgPC92YXJsaXN0ZW50cnk+CisgICAgICAgIDwvdmFyaWFibGVsaXN0PgorICAgIDwvcmVmc2Vj dDE+CisKICAgICA8eGk6aW5jbHVkZSB4bWxuczp4aT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9Y SW5jbHVkZSIgaHJlZj0iaW5jbHVkZS9zZWVhbHNvLnhtbCIgLz4KIAogPC9yZWZlbnRyeT4KZGlm ZiAtLWdpdCBhL3NyYy90b29scy9jb21tb24vc3NzX3Rvb2xzLmMgYi9zcmMvdG9vbHMvY29tbW9u L3Nzc190b29scy5jCmluZGV4IDZiYmNlM2EyNWRkZGRjMGIyM2ViYzEwOGE5MTdhMzhlOTQ5ODFi NjUuLjNlNzMyYTM0MTE0OTQyNjJlYTM0YTFlNWMzMzJlODZmNTEyOGU3NzEgMTAwNjQ0Ci0tLSBh L3NyYy90b29scy9jb21tb24vc3NzX3Rvb2xzLmMKKysrIGIvc3JjL3Rvb2xzL2NvbW1vbi9zc3Nf dG9vbHMuYwpAQCAtMzYsNiArMzYsMTMgQEAgc3RydWN0IHNzc19jbWRsaW5lIHsKICAgICBjb25z dCBjaGFyICoqYXJndjsKIH07CiAKK3N0YXRpYyB2b2lkIHNzc190b29sX3ByaW50X2NvbW1vbl9v cHRzKHZvaWQpCit7CisgICAgZnByaW50ZihzdGRlcnIsIF8oIkNvbW1vbiBvcHRpb25zOlxuIikp OworICAgIGZwcmludGYoc3RkZXJyLCAiICAtZCwgLS1kZWJ1Zz1JTlQgICAgICAgICVzXG4iLAor ICAgICAgICAgICAgICAgICAgICBfKCJFbmFibGUgZGVidWcgYXQgbGV2ZWwiKSk7Cit9CisKIHN0 YXRpYyB2b2lkIHNzc190b29sX2NvbW1vbl9vcHRzKHN0cnVjdCBzc3NfdG9vbF9jdHggKnRvb2xf Y3R4LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ICphcmdjLCBjb25zdCBj aGFyICoqYXJndikKIHsKQEAgLTIwMSw2ICsyMDgsOSBAQCBpbnQgc3NzX3Rvb2xfdXNhZ2UoY29u c3QgY2hhciAqdG9vbF9uYW1lLAogICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIiogJXNcbiIsIGNv bW1hbmRzW2ldLmNvbW1hbmQpOwogICAgIH0KIAorICAgIGZwcmludGYoc3RkZXJyLCBfKCJcbiIp KTsKKyAgICBzc3NfdG9vbF9wcmludF9jb21tb25fb3B0cygpOworCiAgICAgcmV0dXJuIEVYSVRf RkFJTFVSRTsKIH0KIApAQCAtMjM3LDYgKzI0NywxMyBAQCBpbnQgc3NzX3Rvb2xfcm91dGUoaW50 IGFyZ2MsIGNvbnN0IGNoYXIgKiphcmd2LAogICAgIHJldHVybiBzc3NfdG9vbF91c2FnZShhcmd2 WzBdLCBjb21tYW5kcyk7CiB9CiAKK3N0YXRpYyB2b2lkIHNzc190b29sX3BvcHRfcHJpbnRfaGVs cChwb3B0Q29udGV4dCBwYykKK3sKKyAgICBwb3B0UHJpbnRIZWxwKHBjLCBzdGRlcnIsIDApOwor ICAgIGZwcmludGYoc3RkZXJyLCAiXG4iKTsKKyAgICBzc3NfdG9vbF9wcmludF9jb21tb25fb3B0 cygpOworfQorCiBpbnQgc3NzX3Rvb2xfcG9wdF9leChzdHJ1Y3Qgc3NzX2NtZGxpbmUgKmNtZGxp bmUsCiAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgcG9wdE9wdGlvbiAqb3B0aW9ucywKICAg ICAgICAgICAgICAgICAgICAgIGVudW0gc3NzX3Rvb2xfb3B0IHJlcXVpcmVfb3B0aW9uLApAQCAt Mjg2LDcgKzMwMyw3IEBAIGludCBzc3NfdG9vbF9wb3B0X2V4KHN0cnVjdCBzc3NfY21kbGluZSAq Y21kbGluZSwKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIGZwcmludGYoc3RkZXJyLCBf KCJJbnZhbGlkIG9wdGlvbiAlczogJXNcblxuIiksCiAgICAgICAgICAgICAgICAgICAgIHBvcHRC YWRPcHRpb24ocGMsIDApLCBwb3B0U3RyZXJyb3IocmV0KSk7Ci0gICAgICAgICAgICBwb3B0UHJp bnRIZWxwKHBjLCBzdGRlcnIsIDApOworICAgICAgICAgICAgc3NzX3Rvb2xfcG9wdF9wcmludF9o ZWxwKHBjKTsKICAgICAgICAgICAgIHJldCA9IEVYSVRfRkFJTFVSRTsKICAgICAgICAgICAgIGdv dG8gZG9uZTsKICAgICAgICAgfQpAQCAtMjk3LDcgKzMxNCw3IEBAIGludCBzc3NfdG9vbF9wb3B0 X2V4KHN0cnVjdCBzc3NfY21kbGluZSAqY21kbGluZSwKICAgICAgICAgKl9mb3B0ID0gcG9wdEdl dEFyZyhwYyk7CiAgICAgICAgIGlmICgqX2ZvcHQgPT0gTlVMTCkgewogICAgICAgICAgICAgZnBy aW50ZihzdGRlcnIsIF8oIk1pc3Npbmcgb3B0aW9uOiAlc1xuXG4iKSwgZm9wdF9oZWxwKTsKLSAg ICAgICAgICAgIHBvcHRQcmludEhlbHAocGMsIHN0ZGVyciwgMCk7CisgICAgICAgICAgICBzc3Nf dG9vbF9wb3B0X3ByaW50X2hlbHAocGMpOwogICAgICAgICAgICAgcmV0ID0gRVhJVF9GQUlMVVJF OwogICAgICAgICAgICAgZ290byBkb25lOwogICAgICAgICB9CkBAIC0zMDUsNyArMzIyLDcgQEAg aW50IHNzc190b29sX3BvcHRfZXgoc3RydWN0IHNzc19jbWRsaW5lICpjbWRsaW5lLAogICAgICAg ICAvKiBObyBtb3JlIGFyZ3VtZW50cyBleHBlY3RlZC4gSWYgc29tZXRoaW5nIGZvbGxvd3MgaXQg aXMgYW4gZXJyb3IuICovCiAgICAgICAgIGlmIChwb3B0R2V0QXJnKHBjKSkgewogICAgICAgICAg ICAgZnByaW50ZihzdGRlcnIsIF8oIk9ubHkgb25lIGZyZWUgYXJndW1lbnQgaXMgZXhwZWN0ZWQh XG5cbiIpKTsKLSAgICAgICAgICAgIHBvcHRQcmludEhlbHAocGMsIHN0ZGVyciwgMCk7CisgICAg ICAgICAgICBzc3NfdG9vbF9wb3B0X3ByaW50X2hlbHAocGMpOwogICAgICAgICAgICAgcmV0ID0g RVhJVF9GQUlMVVJFOwogICAgICAgICAgICAgZ290byBkb25lOwogICAgICAgICB9CkBAIC0zMTUs NyArMzMyLDcgQEAgaW50IHNzc190b29sX3BvcHRfZXgoc3RydWN0IHNzc19jbWRsaW5lICpjbWRs aW5lLAogICAgIGlmIChyZXF1aXJlX29wdGlvbiA9PSBTU1NfVE9PTF9PUFRfUkVRVUlSRUQKICAg ICAgICAgICAgICYmICgoX2ZvcHQgIT0gTlVMTCAmJiBjbWRsaW5lLT5hcmdjIDwgMikgfHwgY21k bGluZS0+YXJnYyA8IDEpKSB7CiAgICAgICAgIGZwcmludGYoc3RkZXJyLCBfKCJBdCBsZWFzdCBv bmUgb3B0aW9uIGlzIHJlcXVpcmVkIVxuXG4iKSk7Ci0gICAgICAgIHBvcHRQcmludEhlbHAocGMs IHN0ZGVyciwgMCk7CisgICAgICAgIHNzc190b29sX3BvcHRfcHJpbnRfaGVscChwYyk7CiAgICAg ICAgIHJldCA9IEVYSVRfRkFJTFVSRTsKICAgICAgICAgZ290byBkb25lOwogICAgIH0KLS0gCjIu MS4wCgo= --===============2330541331268421246==--