d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified locale(1) to be able to show the altmon_X fields and the [cxX]_fmt's.

Browse Source 
Also modify the "-k list" option to display only fields with a certain prefix.

MFC after:	1 week
This commit is contained in:
Edwin Groothuis 2009-10-05 07:11:19 +00:00
parent 4bdcc9c7d7
commit a250649bd8
3 changed files with 54 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/langinfo.h
View File

@ -114,6 +114,20 @@ typedef __nl_item nl_item;
#define D_MD_ORDER 57 /* month/day order (local extension) */
#endif
/* standalone months forms for %OB */
#define ALTMON_1 58
#define ALTMON_2 59
#define ALTMON_3 60
#define ALTMON_4 61
#define ALTMON_5 62
#define ALTMON_6 63
#define ALTMON_7 64
#define ALTMON_8 65
#define ALTMON_9 66
#define ALTMON_10 67
#define ALTMON_11 68
#define ALTMON_12 69
__BEGIN_DECLS
char *nl_langinfo(nl_item);
__END_DECLS

10
usr.bin/locale/locale.1
View File

@ -35,8 +35,12 @@
.Nm
.Op Fl a | m
.Nm
.Op Fl ck
.Op Ar keyword ...
.Fl k
.Ic list
.Op Ar prefix
.Nm
.Op Fl ck
.Ar keyword ...
.Sh DESCRIPTION
The
.Nm
@ -79,6 +83,8 @@ The special
specific) keyword
.Cm list
can be used to retrieve the human readable list of all available keywords.
If so,
a prefix string can be defined to limit the amount of keywords returned.
.Sh EXIT STATUS
.Ex -std
.Sh SEE ALSO

38
usr.bin/locale/locale.c
View File

@ -55,7 +55,7 @@ const char *lookup_localecat(int);
char *kwval_lconv(int);
int kwval_lookup(char *, char **, int *, int *);
void showdetails(char *);
void showkeywordslist(void);
void showkeywordslist(char *substring);
void showlocale(void);
void usage(void);
@ -149,6 +149,9 @@ struct _kwinfo {
{ "d_t_fmt", 1, LC_TIME, D_T_FMT, "" },
{ "d_fmt", 1, LC_TIME, D_FMT, "" },
{ "t_fmt", 1, LC_TIME, T_FMT, "" },
{ "c_fmt", 1, LC_TIME, C_FMT, "" },
{ "x_fmt", 1, LC_TIME, X_FMT, "" },
{ "X_fmt", 1, LC_TIME, CAPITALX_FMT, "" },
{ "am_str", 1, LC_TIME, AM_STR, "" },
{ "pm_str", 1, LC_TIME, PM_STR, "" },
{ "t_fmt_ampm", 1, LC_TIME, T_FMT_AMPM, "" },
@ -190,6 +193,18 @@ struct _kwinfo {
{ "abmon_10", 1, LC_TIME, ABMON_10, "" },
{ "abmon_11", 1, LC_TIME, ABMON_11, "" },
{ "abmon_12", 1, LC_TIME, ABMON_12, "" },
{ "altmon_1", 1, LC_TIME, ALTMON_1, "" },
{ "altmon_2", 1, LC_TIME, ALTMON_2, "" },
{ "altmon_3", 1, LC_TIME, ALTMON_3, "" },
{ "altmon_4", 1, LC_TIME, ALTMON_4, "" },
{ "altmon_5", 1, LC_TIME, ALTMON_5, "" },
{ "altmon_6", 1, LC_TIME, ALTMON_6, "" },
{ "altmon_7", 1, LC_TIME, ALTMON_7, "" },
{ "altmon_8", 1, LC_TIME, ALTMON_8, "" },
{ "altmon_9", 1, LC_TIME, ALTMON_9, "" },
{ "altmon_10", 1, LC_TIME, ALTMON_10, "" },
{ "altmon_11", 1, LC_TIME, ALTMON_11, "" },
{ "altmon_12", 1, LC_TIME, ALTMON_12, "" },
{ "era", 1, LC_TIME, ERA, "(unavailable)" },
{ "era_d_fmt", 1, LC_TIME, ERA_D_FMT, "(unavailable)" },
{ "era_d_t_fmt", 1, LC_TIME, ERA_D_T_FMT, "(unavailable)" },
@ -217,7 +232,7 @@ main(int argc, char *argv[])
int ch;
int tmp;
while ((ch = getopt(argc, argv, "ackm")) != -1) {
while ((ch = getopt(argc, argv, "ackms:")) != -1) {
switch (ch) {
case 'a':
all_locales = 1;
@ -265,7 +280,7 @@ main(int argc, char *argv[])
if (prt_keywords && argc > 0)
while (tmp < argc)
if (strcasecmp(argv[tmp++], "list") == 0) {
showkeywordslist();
showkeywordslist(argv[tmp]);
exit(0);
}
@ -290,7 +305,8 @@ void
usage(void)
{
printf("Usage: locale [ -a | -m ]\n"
" locale [ -ck ] name ...\n");
" locale -k list [prefix]\n"
" locale [ -ck ] keyword ...\n");
exit(1);
}
@ -594,6 +610,7 @@ showdetails(char *kw)
* invalid keyword specified.
* XXX: any actions?
*/
fprintf(stderr, "Unknown keyword: `%s'\n", kw);
return;
}
@ -639,16 +656,25 @@ lookup_localecat(int cat)
* Show list of keywords
*/
void
showkeywordslist(void)
showkeywordslist(char *substring)
{
size_t i;
#define FMT "%-20s %-12s %-7s %-20s\n"
printf("List of available keywords\n\n");
if (substring == NULL)
printf("List of available keywords\n\n");
else
printf("List of available keywords starting with '%s'\n\n",
substring);
printf(FMT, "Keyword", "Category", "Type", "Comment");
printf("-------------------- ------------ ------- --------------------\n");
for (i = 0; i < NKWINFO; i++) {
if (substring != NULL) {
if (strncmp(kwinfo[i].name, substring,
strlen(substring)) != 0)
continue;
}
printf(FMT,
kwinfo[i].name,
lookup_localecat(kwinfo[i].catid),