Paths

Table of Contentst

-
usr.bin/locale/
-
locale/
2/2
locale.c

Differential D21490

locale: handle day, abday, mon, abmon, am_pm keywords
ClosedPublic
Actions

Authored by yuripv on Sep 2 2019, 3:13 PM.

Details

Reviewers

bapt

Commits

rS352138: locale: handle day, abday, mon, abmon, am_pm keywords

Summary

As reported in PR237752, our locale utility doesn't handle the day, abday, mon, abmon keywords, and that seems to violate POSIX.

Also handle am_pm, which is missing as well.

Test Plan

Simply running locale -k, locale -k day abday mon abmon for the moment. If this implementation looks sane enough, I'll add the test cases for locale(1).

$ LC_ALL=en_US.UTF-8 locale -k day abday mon abmon
day="Sunday";"Monday";"Tuesday";"Wednesday";"Thursday";"Friday";"Saturday"
abday="Sun";"Mon";"Tue";"Wed";"Thu";"Fri";"Sat"
mon="January";"February";"March";"April";"May";"June";"July";"August";"September";"October";"November";"December"
abmon="Jan";"Feb";"Mar";"Apr";"May";"Jun";"Jul";"Aug";"Sep";"Oct";"Nov";"Dec"
$ LC_ALL=ru_RU.UTF-8 locale -k day abday mon abmon
day="воскресенье";"понедельник";"вторник";"среда";"четверг";"пятница";"суббота"
abday="вс";"пн";"вт";"ср";"чт";"пт";"сб"
mon="января";"февраля";"марта";"апреля";"мая";"июня";"июля";"августа";"сентября";"октября";"ноября";"декабря"
abmon="янв.";"февр.";"марта";"апр.";"мая";"июня";"июля";"авг.";"сент.";"окт.";"нояб.";"дек."

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

yuripv created this revision.Sep 2 2019, 3:13 PM

Herald added a subscriber: imp. · View Herald TranscriptSep 2 2019, 3:13 PM

This looks sane to me!

usr.bin/locale/locale.c
803	that if is useless, free deals properly with NULL

This revision is now accepted and ready to land.Sep 3 2019, 8:41 AM

yuripv marked an inline comment as done.Sep 3 2019, 9:20 AM

yuripv added inline comments.

usr.bin/locale/locale.c
803	Yes, but I'm NOT checking kwval for NULL, rather if we did allocate the memory for kwval -- otherwise we'll try to free something we didn't allocate.

yuripv marked an inline comment as done.Sep 3 2019, 9:28 AM

use sbuf functions
also handle am_pm
mark all keywords not specified by POSIX (e.g. abmon_1 through abmon_12, am_str, pm_str, ...) as local additions as other systems (at least Linux and Solaris) do not handle them
add tests

This revision now requires review to proceed.Sep 10 2019, 10:45 AM

bapt accepted this revision.Sep 10 2019, 1:13 PM

This revision is now accepted and ready to land.Sep 10 2019, 1:13 PM

Closed by commit rS352138: locale: handle day, abday, mon, abmon, am_pm keywords (authored by yuripv). · Explain WhySep 10 2019, 3:10 PM

This revision was automatically updated to reflect the committed changes.

yuripv added a commit: rS352138: locale: handle day, abday, mon, abmon, am_pm keywords.

Revision Contents
Changeset List

Path

Size

usr.bin/

locale/

locale.c

376 lines

Diff 61552

View Options

usr.bin/locale/locale.c

Show First 20 Lines • Show All 53 Lines • ▼ Show 20 Lines

/* Local prototypes */		/* Local prototypes */
char format_grouping(const char );		char format_grouping(const char );
void init_locales_list(void);		void init_locales_list(void);
void list_charmaps(void);		void list_charmaps(void);
void list_locales(void);		void list_locales(void);
const char *lookup_localecat(int);		const char *lookup_localecat(int);
char *kwval_lconv(int);		char *kwval_lconv(int);
int kwval_lookup(const char , char , int , int *);		int kwval_lookup(const char , char , int , int , int );
void showdetails(const char *);		void showdetails(const char *);
void showkeywordslist(char *substring);		void showkeywordslist(char *substring);
void showlocale(void);		void showlocale(void);
void usage(void);		void usage(void);

/* Global variables */		/* Global variables */
static StringList *locales = NULL;		static StringList *locales = NULL;

Show All 11 Lines	static const struct _lcinfo {
{ "LC_TIME", LC_TIME },		{ "LC_TIME", LC_TIME },
{ "LC_NUMERIC", LC_NUMERIC },		{ "LC_NUMERIC", LC_NUMERIC },
{ "LC_MONETARY", LC_MONETARY },		{ "LC_MONETARY", LC_MONETARY },
{ "LC_MESSAGES", LC_MESSAGES }		{ "LC_MESSAGES", LC_MESSAGES }
};		};
#define NLCINFO nitems(lcinfo)		#define NLCINFO nitems(lcinfo)

/* ids for values not referenced by nl_langinfo() */		/* ids for values not referenced by nl_langinfo() */
#define KW_ZERO 10000		enum {
#define KW_GROUPING (KW_ZERO+1)		KW_GROUPING,
#define KW_INT_CURR_SYMBOL (KW_ZERO+2)		KW_INT_CURR_SYMBOL,
#define KW_CURRENCY_SYMBOL (KW_ZERO+3)		KW_CURRENCY_SYMBOL,
#define KW_MON_DECIMAL_POINT (KW_ZERO+4)		KW_MON_DECIMAL_POINT,
#define KW_MON_THOUSANDS_SEP (KW_ZERO+5)		KW_MON_THOUSANDS_SEP,
#define KW_MON_GROUPING (KW_ZERO+6)		KW_MON_GROUPING,
#define KW_POSITIVE_SIGN (KW_ZERO+7)		KW_POSITIVE_SIGN,
#define KW_NEGATIVE_SIGN (KW_ZERO+8)		KW_NEGATIVE_SIGN,
#define KW_INT_FRAC_DIGITS (KW_ZERO+9)		KW_INT_FRAC_DIGITS,
#define KW_FRAC_DIGITS (KW_ZERO+10)		KW_FRAC_DIGITS,
#define KW_P_CS_PRECEDES (KW_ZERO+11)		KW_P_CS_PRECEDES,
#define KW_P_SEP_BY_SPACE (KW_ZERO+12)		KW_P_SEP_BY_SPACE,
#define KW_N_CS_PRECEDES (KW_ZERO+13)		KW_N_CS_PRECEDES,
#define KW_N_SEP_BY_SPACE (KW_ZERO+14)		KW_N_SEP_BY_SPACE,
#define KW_P_SIGN_POSN (KW_ZERO+15)		KW_P_SIGN_POSN,
#define KW_N_SIGN_POSN (KW_ZERO+16)		KW_N_SIGN_POSN,
#define KW_INT_P_CS_PRECEDES (KW_ZERO+17)		KW_INT_P_CS_PRECEDES,
#define KW_INT_P_SEP_BY_SPACE (KW_ZERO+18)		KW_INT_P_SEP_BY_SPACE,
#define KW_INT_N_CS_PRECEDES (KW_ZERO+19)		KW_INT_N_CS_PRECEDES,
#define KW_INT_N_SEP_BY_SPACE (KW_ZERO+20)		KW_INT_N_SEP_BY_SPACE,
#define KW_INT_P_SIGN_POSN (KW_ZERO+21)		KW_INT_P_SIGN_POSN,
#define KW_INT_N_SIGN_POSN (KW_ZERO+22)		KW_INT_N_SIGN_POSN,
		KW_TIME_DAY,
		KW_TIME_ABDAY,
		KW_TIME_MON,
		KW_TIME_ABMON
		};

		enum {
		SRC_LINFO,
		SRC_LCONV,
		SRC_LTIME
		};

static const struct _kwinfo {		static const struct _kwinfo {
const char *name;		const char *name;
int isstr; /* true - string, false - number */		int isstr; /* true - string, false - number */
int catid; /* LC_* */		int catid; /* LC_* */
		int source;
int value_ref;		int value_ref;
const char *comment;		const char *comment;
} kwinfo [] = {		} kwinfo [] = {
{ "charmap", 1, LC_CTYPE, CODESET, "" }, /* hack */		{ "charmap", 1, LC_CTYPE, SRC_LINFO, CODESET,
		"" }, /* hack */

{ "decimal_point", 1, LC_NUMERIC, RADIXCHAR, "" },		{ "decimal_point", 1, LC_NUMERIC, SRC_LINFO, RADIXCHAR, "" },
{ "thousands_sep", 1, LC_NUMERIC, THOUSEP, "" },		{ "thousands_sep", 1, LC_NUMERIC, SRC_LINFO, THOUSEP, "" },
{ "grouping", 1, LC_NUMERIC, KW_GROUPING, "" },		{ "grouping", 1, LC_NUMERIC, SRC_LCONV, KW_GROUPING, "" },
{ "radixchar", 1, LC_NUMERIC, RADIXCHAR,		{ "radixchar", 1, LC_NUMERIC, SRC_LINFO, RADIXCHAR,
"Same as decimal_point (FreeBSD only)" }, /* compat */		"Same as decimal_point (FreeBSD only)" }, /* compat */
{ "thousep", 1, LC_NUMERIC, THOUSEP,		{ "thousep", 1, LC_NUMERIC, SRC_LINFO, THOUSEP,
"Same as thousands_sep (FreeBSD only)" }, /* compat */		"Same as thousands_sep (FreeBSD only)" }, /* compat */

{ "int_curr_symbol", 1, LC_MONETARY, KW_INT_CURR_SYMBOL, "" },		{ "int_curr_symbol", 1, LC_MONETARY, SRC_LCONV, KW_INT_CURR_SYMBOL,
{ "currency_symbol", 1, LC_MONETARY, KW_CURRENCY_SYMBOL, "" },		"" },
{ "mon_decimal_point", 1, LC_MONETARY, KW_MON_DECIMAL_POINT, "" },		{ "currency_symbol", 1, LC_MONETARY, SRC_LCONV, KW_CURRENCY_SYMBOL,
{ "mon_thousands_sep", 1, LC_MONETARY, KW_MON_THOUSANDS_SEP, "" },		"" },
{ "mon_grouping", 1, LC_MONETARY, KW_MON_GROUPING, "" },		{ "mon_decimal_point", 1, LC_MONETARY, SRC_LCONV, KW_MON_DECIMAL_POINT,
{ "positive_sign", 1, LC_MONETARY, KW_POSITIVE_SIGN, "" },		"" },
{ "negative_sign", 1, LC_MONETARY, KW_NEGATIVE_SIGN, "" },		{ "mon_thousands_sep", 1, LC_MONETARY, SRC_LCONV, KW_MON_THOUSANDS_SEP,
		"" },
		{ "mon_grouping", 1, LC_MONETARY, SRC_LCONV, KW_MON_GROUPING,
		"" },
		{ "positive_sign", 1, LC_MONETARY, SRC_LCONV, KW_POSITIVE_SIGN,
		"" },
		{ "negative_sign", 1, LC_MONETARY, SRC_LCONV, KW_NEGATIVE_SIGN,
		"" },

{ "int_frac_digits", 0, LC_MONETARY, KW_INT_FRAC_DIGITS, "" },		{ "int_frac_digits", 0, LC_MONETARY, SRC_LCONV, KW_INT_FRAC_DIGITS,
{ "frac_digits", 0, LC_MONETARY, KW_FRAC_DIGITS, "" },		"" },
{ "p_cs_precedes", 0, LC_MONETARY, KW_P_CS_PRECEDES, "" },		{ "frac_digits", 0, LC_MONETARY, SRC_LCONV, KW_FRAC_DIGITS, "" },
{ "p_sep_by_space", 0, LC_MONETARY, KW_P_SEP_BY_SPACE, "" },		{ "p_cs_precedes", 0, LC_MONETARY, SRC_LCONV, KW_P_CS_PRECEDES,
{ "n_cs_precedes", 0, LC_MONETARY, KW_N_CS_PRECEDES, "" },		"" },
{ "n_sep_by_space", 0, LC_MONETARY, KW_N_SEP_BY_SPACE, "" },		{ "p_sep_by_space", 0, LC_MONETARY, SRC_LCONV, KW_P_SEP_BY_SPACE,
{ "p_sign_posn", 0, LC_MONETARY, KW_P_SIGN_POSN, "" },		"" },
{ "n_sign_posn", 0, LC_MONETARY, KW_N_SIGN_POSN, "" },		{ "n_cs_precedes", 0, LC_MONETARY, SRC_LCONV, KW_N_CS_PRECEDES,
{ "int_p_cs_precedes", 0, LC_MONETARY, KW_INT_P_CS_PRECEDES, "" },		"" },
{ "int_p_sep_by_space", 0, LC_MONETARY, KW_INT_P_SEP_BY_SPACE, "" },		{ "n_sep_by_space", 0, LC_MONETARY, SRC_LCONV, KW_N_SEP_BY_SPACE,
{ "int_n_cs_precedes", 0, LC_MONETARY, KW_INT_N_CS_PRECEDES, "" },		"" },
{ "int_n_sep_by_space", 0, LC_MONETARY, KW_INT_N_SEP_BY_SPACE, "" },		{ "p_sign_posn", 0, LC_MONETARY, SRC_LCONV, KW_P_SIGN_POSN, "" },
{ "int_p_sign_posn", 0, LC_MONETARY, KW_INT_P_SIGN_POSN, "" },		{ "n_sign_posn", 0, LC_MONETARY, SRC_LCONV, KW_N_SIGN_POSN, "" },
{ "int_n_sign_posn", 0, LC_MONETARY, KW_INT_N_SIGN_POSN, "" },		{ "int_p_cs_precedes", 0, LC_MONETARY, SRC_LCONV, KW_INT_P_CS_PRECEDES,
		"" },
		{ "int_p_sep_by_space", 0, LC_MONETARY, SRC_LCONV,
		KW_INT_P_SEP_BY_SPACE, "" },
		{ "int_n_cs_precedes", 0, LC_MONETARY, SRC_LCONV, KW_INT_N_CS_PRECEDES,
		"" },
		{ "int_n_sep_by_space", 0, LC_MONETARY, SRC_LCONV,
		KW_INT_N_SEP_BY_SPACE, "" },
		{ "int_p_sign_posn", 0, LC_MONETARY, SRC_LCONV, KW_INT_P_SIGN_POSN,
		"" },
		{ "int_n_sign_posn", 0, LC_MONETARY, SRC_LCONV, KW_INT_N_SIGN_POSN,
		"" },

{ "d_t_fmt", 1, LC_TIME, D_T_FMT, "" },		{ "d_t_fmt", 1, LC_TIME, SRC_LINFO, D_T_FMT, "" },
{ "d_fmt", 1, LC_TIME, D_FMT, "" },		{ "d_fmt", 1, LC_TIME, SRC_LINFO, D_FMT, "" },
{ "t_fmt", 1, LC_TIME, T_FMT, "" },		{ "t_fmt", 1, LC_TIME, SRC_LINFO, T_FMT, "" },
{ "am_str", 1, LC_TIME, AM_STR, "" },		{ "am_str", 1, LC_TIME, SRC_LINFO, AM_STR, "" },
{ "pm_str", 1, LC_TIME, PM_STR, "" },		{ "pm_str", 1, LC_TIME, SRC_LINFO, PM_STR, "" },
{ "t_fmt_ampm", 1, LC_TIME, T_FMT_AMPM, "" },		{ "t_fmt_ampm", 1, LC_TIME, SRC_LINFO, T_FMT_AMPM, "" },
{ "day_1", 1, LC_TIME, DAY_1, "" },		{ "day", 1, LC_TIME, SRC_LTIME, KW_TIME_DAY, "" },
{ "day_2", 1, LC_TIME, DAY_2, "" },		{ "day_1", 1, LC_TIME, SRC_LINFO, DAY_1, "" },
{ "day_3", 1, LC_TIME, DAY_3, "" },		{ "day_2", 1, LC_TIME, SRC_LINFO, DAY_2, "" },
{ "day_4", 1, LC_TIME, DAY_4, "" },		{ "day_3", 1, LC_TIME, SRC_LINFO, DAY_3, "" },
{ "day_5", 1, LC_TIME, DAY_5, "" },		{ "day_4", 1, LC_TIME, SRC_LINFO, DAY_4, "" },
{ "day_6", 1, LC_TIME, DAY_6, "" },		{ "day_5", 1, LC_TIME, SRC_LINFO, DAY_5, "" },
{ "day_7", 1, LC_TIME, DAY_7, "" },		{ "day_6", 1, LC_TIME, SRC_LINFO, DAY_6, "" },
{ "abday_1", 1, LC_TIME, ABDAY_1, "" },		{ "day_7", 1, LC_TIME, SRC_LINFO, DAY_7, "" },
{ "abday_2", 1, LC_TIME, ABDAY_2, "" },		{ "abday", 1, LC_TIME, SRC_LTIME, KW_TIME_ABDAY, "" },
{ "abday_3", 1, LC_TIME, ABDAY_3, "" },		{ "abday_1", 1, LC_TIME, SRC_LINFO, ABDAY_1, "" },
{ "abday_4", 1, LC_TIME, ABDAY_4, "" },		{ "abday_2", 1, LC_TIME, SRC_LINFO, ABDAY_2, "" },
{ "abday_5", 1, LC_TIME, ABDAY_5, "" },		{ "abday_3", 1, LC_TIME, SRC_LINFO, ABDAY_3, "" },
{ "abday_6", 1, LC_TIME, ABDAY_6, "" },		{ "abday_4", 1, LC_TIME, SRC_LINFO, ABDAY_4, "" },
{ "abday_7", 1, LC_TIME, ABDAY_7, "" },		{ "abday_5", 1, LC_TIME, SRC_LINFO, ABDAY_5, "" },
{ "mon_1", 1, LC_TIME, MON_1, "" },		{ "abday_6", 1, LC_TIME, SRC_LINFO, ABDAY_6, "" },
{ "mon_2", 1, LC_TIME, MON_2, "" },		{ "abday_7", 1, LC_TIME, SRC_LINFO, ABDAY_7, "" },
{ "mon_3", 1, LC_TIME, MON_3, "" },		{ "mon", 1, LC_TIME, SRC_LTIME, KW_TIME_MON, "" },
{ "mon_4", 1, LC_TIME, MON_4, "" },		{ "mon_1", 1, LC_TIME, SRC_LINFO, MON_1, "" },
{ "mon_5", 1, LC_TIME, MON_5, "" },		{ "mon_2", 1, LC_TIME, SRC_LINFO, MON_2, "" },
{ "mon_6", 1, LC_TIME, MON_6, "" },		{ "mon_3", 1, LC_TIME, SRC_LINFO, MON_3, "" },
{ "mon_7", 1, LC_TIME, MON_7, "" },		{ "mon_4", 1, LC_TIME, SRC_LINFO, MON_4, "" },
{ "mon_8", 1, LC_TIME, MON_8, "" },		{ "mon_5", 1, LC_TIME, SRC_LINFO, MON_5, "" },
{ "mon_9", 1, LC_TIME, MON_9, "" },		{ "mon_6", 1, LC_TIME, SRC_LINFO, MON_6, "" },
{ "mon_10", 1, LC_TIME, MON_10, "" },		{ "mon_7", 1, LC_TIME, SRC_LINFO, MON_7, "" },
{ "mon_11", 1, LC_TIME, MON_11, "" },		{ "mon_8", 1, LC_TIME, SRC_LINFO, MON_8, "" },
{ "mon_12", 1, LC_TIME, MON_12, "" },		{ "mon_9", 1, LC_TIME, SRC_LINFO, MON_9, "" },
{ "abmon_1", 1, LC_TIME, ABMON_1, "" },		{ "mon_10", 1, LC_TIME, SRC_LINFO, MON_10, "" },
{ "abmon_2", 1, LC_TIME, ABMON_2, "" },		{ "mon_11", 1, LC_TIME, SRC_LINFO, MON_11, "" },
{ "abmon_3", 1, LC_TIME, ABMON_3, "" },		{ "mon_12", 1, LC_TIME, SRC_LINFO, MON_12, "" },
{ "abmon_4", 1, LC_TIME, ABMON_4, "" },		{ "abmon", 1, LC_TIME, SRC_LTIME, KW_TIME_ABMON, "" },
{ "abmon_5", 1, LC_TIME, ABMON_5, "" },		{ "abmon_1", 1, LC_TIME, SRC_LINFO, ABMON_1, "" },
{ "abmon_6", 1, LC_TIME, ABMON_6, "" },		{ "abmon_2", 1, LC_TIME, SRC_LINFO, ABMON_2, "" },
{ "abmon_7", 1, LC_TIME, ABMON_7, "" },		{ "abmon_3", 1, LC_TIME, SRC_LINFO, ABMON_3, "" },
{ "abmon_8", 1, LC_TIME, ABMON_8, "" },		{ "abmon_4", 1, LC_TIME, SRC_LINFO, ABMON_4, "" },
{ "abmon_9", 1, LC_TIME, ABMON_9, "" },		{ "abmon_5", 1, LC_TIME, SRC_LINFO, ABMON_5, "" },
{ "abmon_10", 1, LC_TIME, ABMON_10, "" },		{ "abmon_6", 1, LC_TIME, SRC_LINFO, ABMON_6, "" },
{ "abmon_11", 1, LC_TIME, ABMON_11, "" },		{ "abmon_7", 1, LC_TIME, SRC_LINFO, ABMON_7, "" },
{ "abmon_12", 1, LC_TIME, ABMON_12, "" },		{ "abmon_8", 1, LC_TIME, SRC_LINFO, ABMON_8, "" },
{ "altmon_1", 1, LC_TIME, ALTMON_1, "(FreeBSD only)" },		{ "abmon_9", 1, LC_TIME, SRC_LINFO, ABMON_9, "" },
{ "altmon_2", 1, LC_TIME, ALTMON_2, "(FreeBSD only)" },		{ "abmon_10", 1, LC_TIME, SRC_LINFO, ABMON_10, "" },
{ "altmon_3", 1, LC_TIME, ALTMON_3, "(FreeBSD only)" },		{ "abmon_11", 1, LC_TIME, SRC_LINFO, ABMON_11, "" },
{ "altmon_4", 1, LC_TIME, ALTMON_4, "(FreeBSD only)" },		{ "abmon_12", 1, LC_TIME, SRC_LINFO, ABMON_12, "" },
{ "altmon_5", 1, LC_TIME, ALTMON_5, "(FreeBSD only)" },		{ "altmon_1", 1, LC_TIME, SRC_LINFO, ALTMON_1,
{ "altmon_6", 1, LC_TIME, ALTMON_6, "(FreeBSD only)" },		"(FreeBSD only)" },
{ "altmon_7", 1, LC_TIME, ALTMON_7, "(FreeBSD only)" },		{ "altmon_2", 1, LC_TIME, SRC_LINFO, ALTMON_2,
{ "altmon_8", 1, LC_TIME, ALTMON_8, "(FreeBSD only)" },		"(FreeBSD only)" },
{ "altmon_9", 1, LC_TIME, ALTMON_9, "(FreeBSD only)" },		{ "altmon_3", 1, LC_TIME, SRC_LINFO, ALTMON_3,
{ "altmon_10", 1, LC_TIME, ALTMON_10, "(FreeBSD only)" },		"(FreeBSD only)" },
{ "altmon_11", 1, LC_TIME, ALTMON_11, "(FreeBSD only)" },		{ "altmon_4", 1, LC_TIME, SRC_LINFO, ALTMON_4,
{ "altmon_12", 1, LC_TIME, ALTMON_12, "(FreeBSD only)" },		"(FreeBSD only)" },
{ "era", 1, LC_TIME, ERA, "(unavailable)" },		{ "altmon_5", 1, LC_TIME, SRC_LINFO, ALTMON_5,
{ "era_d_fmt", 1, LC_TIME, ERA_D_FMT, "(unavailable)" },		"(FreeBSD only)" },
{ "era_d_t_fmt", 1, LC_TIME, ERA_D_T_FMT, "(unavailable)" },		{ "altmon_6", 1, LC_TIME, SRC_LINFO, ALTMON_6,
{ "era_t_fmt", 1, LC_TIME, ERA_T_FMT, "(unavailable)" },		"(FreeBSD only)" },
{ "alt_digits", 1, LC_TIME, ALT_DIGITS, "" },		{ "altmon_7", 1, LC_TIME, SRC_LINFO, ALTMON_7,
{ "d_md_order", 1, LC_TIME, D_MD_ORDER,		"(FreeBSD only)" },
		{ "altmon_8", 1, LC_TIME, SRC_LINFO, ALTMON_8,
		"(FreeBSD only)" },
		{ "altmon_9", 1, LC_TIME, SRC_LINFO, ALTMON_9,
		"(FreeBSD only)" },
		{ "altmon_10", 1, LC_TIME, SRC_LINFO, ALTMON_10,
		"(FreeBSD only)" },
		{ "altmon_11", 1, LC_TIME, SRC_LINFO, ALTMON_11,
		"(FreeBSD only)" },
		{ "altmon_12", 1, LC_TIME, SRC_LINFO, ALTMON_12,
		"(FreeBSD only)" },
		{ "era", 1, LC_TIME, SRC_LINFO, ERA,
		"(unavailable)" },
		{ "era_d_fmt", 1, LC_TIME, SRC_LINFO, ERA_D_FMT,
		"(unavailable)" },
		{ "era_d_t_fmt", 1, LC_TIME, SRC_LINFO, ERA_D_T_FMT,
		"(unavailable)" },
		{ "era_t_fmt", 1, LC_TIME, SRC_LINFO, ERA_T_FMT,
		"(unavailable)" },
		{ "alt_digits", 1, LC_TIME, SRC_LINFO, ALT_DIGITS, "" },
		{ "d_md_order", 1, LC_TIME, SRC_LINFO, D_MD_ORDER,
"(FreeBSD only)" }, /* local */		"(FreeBSD only)" }, /* local */

{ "yesexpr", 1, LC_MESSAGES, YESEXPR, "" },		{ "yesexpr", 1, LC_MESSAGES, SRC_LINFO, YESEXPR, "" },
{ "noexpr", 1, LC_MESSAGES, NOEXPR, "" },		{ "noexpr", 1, LC_MESSAGES, SRC_LINFO, NOEXPR, "" },
{ "yesstr", 1, LC_MESSAGES, YESSTR,		{ "yesstr", 1, LC_MESSAGES, SRC_LINFO, YESSTR,
"(POSIX legacy)" }, /* compat */		"(POSIX legacy)" }, /* compat */
{ "nostr", 1, LC_MESSAGES, NOSTR,		{ "nostr", 1, LC_MESSAGES, SRC_LINFO, NOSTR,
"(POSIX legacy)" } /* compat */		"(POSIX legacy)" } /* compat */

};		};
#define NKWINFO (nitems(kwinfo))		#define NKWINFO (nitems(kwinfo))

static const char *boguslocales[] = { "UTF-8" };		static const char *boguslocales[] = { "UTF-8" };
#define NBOGUS (nitems(boguslocales))		#define NBOGUS (nitems(boguslocales))

▲ Show 20 Lines • Show All 286 Lines • ▼ Show 20 Lines	#endif
/* Truncate at the last successfully snprintf()ed semicolon. */		/* Truncate at the last successfully snprintf()ed semicolon. */
if (roff != 0)		if (roff != 0)
rval[roff - 1] = '\0';		rval[roff - 1] = '\0';

return (&rval[0]);		return (&rval[0]);
}		}

/*		/*
* keyword value lookup helper (via localeconv())		* keyword value lookup helper for values accessible via localeconv()
*/		*/
char *		char *
kwval_lconv(int id)		kwval_lconv(int id)
{		{
struct lconv *lc;		struct lconv *lc;
char *rval;		char *rval;

rval = NULL;		rval = NULL;
▲ Show 20 Lines • Show All 66 Lines • ▼ Show 20 Lines	case KW_INT_N_SIGN_POSN:
rval = &(lc->int_n_sign_posn);		rval = &(lc->int_n_sign_posn);
break;		break;
default:		default:
break;		break;
}		}
return (rval);		return (rval);
}		}

		static size_t
		_kwval_ltime(char *dst, nl_item s_item, nl_item e_item)
		{
		nl_item i;
		size_t rval = 0;

		for (i = s_item; i <= e_item; i++) {
		if (dst == NULL) {
		rval +=
		(i != s_item ? 1 : 0) +
		strlen(nl_langinfo(i)) +
		(i != e_item ? 2 : 0);
		} else {
		dst += sprintf(dst, "%s%s%s",
		i != s_item ? "\"" : "",
		nl_langinfo(i),
		i != e_item ? "\";" : "");
		}
		}

		if (dst == NULL)
		rval++;

		return (rval);
		}

/*		/*
		* keyword value lookup helper for LC_TIME keywords not accessible
		* via nl_langinfo() or localeconv()
		*/
		static char *
		kwval_ltime(int id)
		{
		char *rval;
		size_t rlen;
		nl_item s_item, e_item;

		switch (id) {
		case KW_TIME_DAY:
		s_item = DAY_1;
		e_item = DAY_7;
		break;
		case KW_TIME_ABDAY:
		s_item = ABDAY_1;
		e_item = ABDAY_7;
		break;
		case KW_TIME_MON:
		s_item = MON_1;
		e_item = MON_12;
		break;
		case KW_TIME_ABMON:
		s_item = ABMON_1;
		e_item = ABMON_12;
		break;
		}

		rlen = _kwval_ltime(NULL, s_item, e_item);
		rval = malloc(rlen);
		if (rval == NULL)
		err(1, "malloc");
		(void) _kwval_ltime(rval, s_item, e_item);
		return (rval);
		}

		/*
* keyword value and properties lookup		* keyword value and properties lookup
*/		*/
int		int
kwval_lookup(const char kwname, char kwval, int cat, int *isstr)		kwval_lookup(const char kwname, char kwval, int cat, int isstr, int alloc)
{		{
int rval;		int rval;
size_t i;		size_t i;

rval = 0;		rval = 0;
		*alloc = 0;
for (i = 0; i < NKWINFO; i++) {		for (i = 0; i < NKWINFO; i++) {
if (strcasecmp(kwname, kwinfo[i].name) == 0) {		if (strcasecmp(kwname, kwinfo[i].name) == 0) {
rval = 1;		rval = 1;
*cat = kwinfo[i].catid;		*cat = kwinfo[i].catid;
*isstr = kwinfo[i].isstr;		*isstr = kwinfo[i].isstr;
if (kwinfo[i].value_ref < KW_ZERO) {		switch (kwinfo[i].source) {
		case SRC_LINFO:
*kwval = nl_langinfo(kwinfo[i].value_ref);		*kwval = nl_langinfo(kwinfo[i].value_ref);
} else {		break;
		case SRC_LCONV:
*kwval = kwval_lconv(kwinfo[i].value_ref);		*kwval = kwval_lconv(kwinfo[i].value_ref);
		break;
		case SRC_LTIME:
		*kwval = kwval_ltime(kwinfo[i].value_ref);
		*alloc = 1;
		break;
}		}
break;		break;
}		}
}		}

return (rval);		return (rval);
}		}

/*		/*
* Show details about requested keyword according to '-k' and/or '-c'		* Show details about requested keyword according to '-k' and/or '-c'
* command line options specified.		* command line options specified.
*/		*/
void		void
showdetails(const char *kw)		showdetails(const char *kw)
{		{
int isstr, cat, tmpval;		int isstr, cat, tmpval, alloc;
char *kwval;		char *kwval;

if (kwval_lookup(kw, &kwval, &cat, &isstr) == 0) {		if (kwval_lookup(kw, &kwval, &cat, &isstr, &alloc) == 0) {
/*		/*
* invalid keyword specified.		* invalid keyword specified.
* XXX: any actions?		* XXX: any actions?
*/		*/
fprintf(stderr, "Unknown keyword: `%s'\n", kw);		fprintf(stderr, "Unknown keyword: `%s'\n", kw);
return;		return;
}		}

Show All 16 Lines	showdetails(const char *kw)
if (!prt_categories && !prt_keywords) {		if (!prt_categories && !prt_keywords) {
if (isstr) {		if (isstr) {
printf("%s\n", kwval);		printf("%s\n", kwval);
} else {		} else {
tmpval = (char) *kwval;		tmpval = (char) *kwval;
printf("%d\n", tmpval);		printf("%d\n", tmpval);
}		}
}		}

		if (alloc)
		free(kwval);
		baptUnsubmitted Done Inline Actions that if is useless, free deals properly with NULL bapt: that if is useless, free deals properly with NULL
		yuripvAuthorUnsubmitted Done Inline Actions Yes, but I'm NOT checking kwval for NULL, rather if we did allocate the memory for kwval -- otherwise we'll try to free something we didn't allocate. yuripv: Yes, but I'm NOT checking kwval for NULL, rather if we did allocate the memory for kwval…
}		}

/*		/*
* Convert locale category id into string		* Convert locale category id into string
*/		*/
const char *		const char *
lookup_localecat(int cat)		lookup_localecat(int cat)
{		{
Show All 39 Lines

locale: handle day, abday, mon, abmon, am_pm keywordsClosedPublicActions