[30971] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix gettext extraction of usage messages
daemon@ATHENA.MIT.EDU (Greg Hudson)
Tue Feb 23 17:55:33 2021
Date: Tue, 23 Feb 2021 17:55:06 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-ID: <202102232255.11NMt6JA018136@drugstore.mit.edu>
To: <cvs-krb5@mit.edu>
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b205aca92c8c34e3611cc1fab58ae3248f2f37ae
commit b205aca92c8c34e3611cc1fab58ae3248f2f37ae
Author: Greg Hudson <ghudson@mit.edu>
Date: Sat Feb 20 01:34:09 2021 -0500
Fix gettext extraction of usage messages
Stop using macros for the newline and tab dividers between lines of
usage messages in kinit and kvno, so that gettext can extract the full
string.
src/clients/kinit/kinit.c | 19 +++++++------------
src/clients/kvno/kvno.c | 10 ++++------
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index d1f5d74..d54bb05 100644
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -141,18 +141,13 @@ usage()
{
fprintf(stderr,
_("Usage: %s [-V] [-l lifetime] [-s start_time] "
- "[-r renewable_life]"
- USAGE_BREAK
- "[-f | -F] [-p | -P] [-n] [-a | -A] [-C] [-E]"
- USAGE_BREAK
- "[--request-pac | --no-request-pac] "
- USAGE_BREAK
- "[-v] [-R] [-k [-i|-t keytab_file]] [-c cachename]"
- USAGE_BREAK
- "[-S service_name] [-I input_ccache] [-T ticket_armor_cache]"
- USAGE_BREAK
- "[-X <attribute>[=<value>]] [principal]"
- "\n\n"), progname);
+ "[-r renewable_life]\n"
+ "\t[-f | -F] [-p | -P] [-n] [-a | -A] [-C] [-E]\n"
+ "\t[--request-pac | --no-request-pac]\n"
+ "\t[-v] [-R] [-k [-i|-t keytab_file]] [-c cachename]\n"
+ "\t[-S service_name] [-I input_ccache] [-T ticket_armor_cache]\n"
+ "\t[-X <attribute>[=<value>]] [principal]\n"
+ "\n"), progname);
fprintf(stderr, " options:\n");
fprintf(stderr, _("\t-V verbose\n"));
diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index f83c68a..89b5ce9 100644
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -38,16 +38,14 @@
static char *prog;
static int quiet = 0;
-#define XUSAGE_BREAK "\n\t"
-
static void
xusage()
{
fprintf(stderr, _("usage: %s [-c ccache] [-e etype] [-k keytab] [-q] "
- "[-u | -S sname]" XUSAGE_BREAK
- "[[{-F cert_file | {-I | -U} for_user} [-P]] | "
- "--u2u ccache]" XUSAGE_BREAK
- "[--cached-only] [--no-store] [--out-cache] "
+ "[-u | -S sname]\n"
+ "\t[[{-F cert_file | {-I | -U} for_user} [-P]] | "
+ "--u2u ccache]\n"
+ "\t[--cached-only] [--no-store] [--out-cache] "
"service1 service2 ...\n"),
prog);
exit(1);
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
