qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gconv_conf: Read configuration files in gconv-modules.d 

Read configuration files with names ending in .conf in
GCONV_PATH/gconv-modules.d to mirror configuration flexibility in
iconvconfig into the iconv program and function.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Siddhesh Poyarekar 2021-06-07 14:22:19 +05:30
parent 3979c3e1ba
commit b17d29b390
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
iconv/gconv_conf.c
View File

@ -19,6 +19,7 @@
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <locale.h> #include <locale.h>
@ -30,6 +31,7 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h>
#include <libc-lock.h> #include <libc-lock.h>
#include <gconv_int.h> #include <gconv_int.h>
@ -57,6 +59,7 @@ static const struct path_elem empty_path_elem = { NULL, 0 };
/* Name of the file containing the module information in the directories /* Name of the file containing the module information in the directories
along the path. */ along the path. */
static const char gconv_conf_filename[] = "gconv-modules"; static const char gconv_conf_filename[] = "gconv-modules";
static const char gconv_conf_dirname[] = "gconv-modules.d";
/* Filename extension for the modules. */ /* Filename extension for the modules. */
#ifndef MODULE_EXT #ifndef MODULE_EXT
@ -556,18 +559,52 @@ __gconv_read_conf (void)
for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt) for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt)
{ {
#define BUF_LEN elem_len + sizeof (gconv_conf_dirname)
const char *elem = __gconv_path_elem[cnt].name; const char *elem = __gconv_path_elem[cnt].name;
size_t elem_len = __gconv_path_elem[cnt].len; size_t elem_len = __gconv_path_elem[cnt].len;
char *filename; char *buf;
/* No slash needs to be inserted between elem and gconv_conf_filename; /* No slash needs to be inserted between elem and gconv_conf_filename;
elem already ends in a slash. */ elem already ends in a slash. */
filename = alloca (elem_len + sizeof (gconv_conf_filename)); buf = alloca (BUF_LEN);
__mempcpy (__mempcpy (filename, elem, elem_len), char *cp = __mempcpy (__mempcpy (buf, elem, elem_len),
gconv_conf_filename, sizeof (gconv_conf_filename)); gconv_conf_filename, sizeof (gconv_conf_filename));
/* Read the next configuration file. */ /* Read the gconv-modules configuration file first. */
read_conf_file (filename, elem, elem_len, &modules, &nmodules); read_conf_file (buf, elem, elem_len, &modules, &nmodules);
/* Next, see if there is a gconv-modules.d directory containing
configuration files and if it is non-empty. */
cp--;
cp[0] = '.';
cp[1] = 'd';
cp[2] = '\0';
DIR *confdir = __opendir (buf);
if (confdir != NULL)
{
struct dirent *ent;
while ((ent = __readdir (confdir)) != NULL)
{
if (ent->d_type != DT_REG)
continue;
size_t len = strlen (ent->d_name);
const char *suffix = ".conf";
if (len > strlen (suffix)
&& strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
{
/* LEN <= PATH_MAX so this alloca is not unbounded. */
char *conf = alloca (BUF_LEN + len + 1);
cp = stpcpy (conf, buf);
sprintf (cp, "/%s", ent->d_name);
read_conf_file (conf, elem, elem_len, &modules, &nmodules);
}
}
__closedir (confdir);
}
} }
#endif #endif