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

Use capsicum helpers to cache NLS data.

Browse Source
This commit is contained in:
oshogbo 2018-06-20 00:13:09 +00:00
parent 07e595c4ad
commit 090724585b
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/primes/primes.c
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");

13
usr.bin/uniq/uniq.c
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");