1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-24 07:40:52 +00:00

Use capsicum helpers to cache NLS data.

This commit is contained in:
Mariusz Zaborski 2018-06-20 00:13:09 +00:00
parent 2d2aba181d
commit a3552326dc
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=335397
2 changed files with 2 additions and 15 deletions

View File

@ -101,9 +101,7 @@ main(int argc, char *argv[])
int ch;
char *p;
/* Cache NLS data, for strerror, for err(3), before cap_enter. */
(void)catopen("libc", NL_CAT_LOCALE);
caph_cache_catpages();
if (caph_enter() < 0)
err(1, "cap_enter");

View File

@ -87,17 +87,6 @@ static wchar_t *skip(wchar_t *);
static void obsolete(char *[]);
static void usage(void);
static void
strerror_init(void)
{
/*
* Cache NLS data before entering capability mode.
* XXXPJD: There should be strerror_init() and strsignal_init() in libc.
*/
(void)catopen("libc", NL_CAT_LOCALE);
}
int
main (int argc, char *argv[])
{
@ -177,7 +166,7 @@ main (int argc, char *argv[])
}
}
strerror_init();
caph_cache_catpages();
if (caph_enter() < 0)
err(1, "unable to enter capability mode");