mirror of
https://sourceware.org/git/glibc.git
synced 2025-09-19 21:21:43 +03:00
On some file systems iconv do not follow symlinks. This happens because read_conf_file() function's directory traversal loop reject symbolic links and then lstat64() call do not follow symlinks. This commit fixes the directory traversal loop to accept symbolic links and then follow the link using stat64(). The test works by creating a temporary directory and placing a symbolic link inside it that points to a configuration file. It then runs iconvconfig on this directory. The test passes if iconvconfig successfully follows the symlink and generates the cache correctly, confirming that the directory traversal logic now properly handles symbolic links. Signed-off-by: Avinal Kumar <avinal.xlvii@gmail.com> Co-authored-by: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org> Reviewed-by: Adhemerval Zanella Netto <adhemerval.zanella@linaro.org>
182 lines
5.1 KiB
C
182 lines
5.1 KiB
C
/* Handle configuration data.
|
|
Copyright (C) 2021-2025 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <dirent.h>
|
|
#include <libc-symbols.h>
|
|
#include <locale.h>
|
|
#include <sys/types.h>
|
|
|
|
#if IS_IN (libc)
|
|
# include <libio/libioP.h>
|
|
# define __getdelim(line, len, c, fp) __getdelim (line, len, c, fp)
|
|
|
|
# undef isspace
|
|
# define isspace(__c) __isspace_l ((__c), _nl_C_locobj_ptr)
|
|
# define asprintf __asprintf
|
|
# define opendir __opendir
|
|
# define readdir64 __readdir64
|
|
# define closedir __closedir
|
|
# define mempcpy __mempcpy
|
|
# define struct_stat64 struct __stat64_t64
|
|
# define stat64_impl __stat64_time64
|
|
# define feof_unlocked __feof_unlocked
|
|
#else
|
|
# define stat64_impl stat64
|
|
# define struct_stat64 struct stat64
|
|
#endif
|
|
|
|
/* Name of the file containing the module information in the directories
|
|
along the path. */
|
|
static const char gconv_conf_filename[] = "gconv-modules";
|
|
|
|
static void add_alias (char *);
|
|
static void add_module (char *, const char *, size_t, int);
|
|
|
|
/* Read the next configuration file. */
|
|
static bool
|
|
read_conf_file (const char *filename, const char *directory, size_t dir_len)
|
|
{
|
|
/* Note the file is opened with cancellation in the I/O functions
|
|
disabled. */
|
|
FILE *fp = fopen (filename, "rce");
|
|
char *line = NULL;
|
|
size_t line_len = 0;
|
|
static int modcounter;
|
|
|
|
/* Don't complain if a file is not present or readable, simply silently
|
|
ignore it. */
|
|
if (fp == NULL)
|
|
return false;
|
|
|
|
/* No threads reading from this stream. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
|
|
/* Process the known entries of the file. Comments start with `#' and
|
|
end with the end of the line. Empty lines are ignored. */
|
|
while (!feof_unlocked (fp))
|
|
{
|
|
char *rp, *endp, *word;
|
|
ssize_t n = __getdelim (&line, &line_len, '\n', fp);
|
|
if (n < 0)
|
|
/* An error occurred. */
|
|
break;
|
|
|
|
rp = line;
|
|
/* Terminate the line (excluding comments or newline) by an NUL byte
|
|
to simplify the following code. */
|
|
endp = strchr (rp, '#');
|
|
if (endp != NULL)
|
|
*endp = '\0';
|
|
else
|
|
if (rp[n - 1] == '\n')
|
|
rp[n - 1] = '\0';
|
|
|
|
while (isspace (*rp))
|
|
++rp;
|
|
|
|
/* If this is an empty line go on with the next one. */
|
|
if (rp == endp)
|
|
continue;
|
|
|
|
word = rp;
|
|
while (*rp != '\0' && !isspace (*rp))
|
|
++rp;
|
|
|
|
if (rp - word == sizeof ("alias") - 1
|
|
&& memcmp (word, "alias", sizeof ("alias") - 1) == 0)
|
|
add_alias (rp);
|
|
else if (rp - word == sizeof ("module") - 1
|
|
&& memcmp (word, "module", sizeof ("module") - 1) == 0)
|
|
add_module (rp, directory, dir_len, modcounter++);
|
|
/* else */
|
|
/* Otherwise ignore the line. */
|
|
}
|
|
|
|
free (line);
|
|
|
|
fclose (fp);
|
|
return true;
|
|
}
|
|
|
|
/* Prefix DIR (with length DIR_LEN) with PREFIX if the latter is non-NULL and
|
|
parse configuration in it. */
|
|
|
|
static __always_inline bool
|
|
gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
|
|
{
|
|
/* No slash needs to be inserted between dir and gconv_conf_filename; dir
|
|
already ends in a slash. The additional 2 is to accommodate the ".d"
|
|
when looking for configuration files in gconv-modules.d. */
|
|
size_t buflen = dir_len + sizeof (gconv_conf_filename) + 2;
|
|
char *buf = malloc (buflen + (prefix != NULL ? strlen (prefix) : 0));
|
|
char *cp = buf;
|
|
bool found = false;
|
|
|
|
if (buf == NULL)
|
|
return false;
|
|
|
|
if (prefix != NULL)
|
|
cp = stpcpy (cp, prefix);
|
|
|
|
cp = mempcpy (mempcpy (cp, dir, dir_len), gconv_conf_filename,
|
|
sizeof (gconv_conf_filename));
|
|
|
|
/* Read the gconv-modules configuration file first. */
|
|
found = read_conf_file (buf, dir, dir_len);
|
|
|
|
/* 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 dirent64 *ent;
|
|
while ((ent = readdir64 (confdir)) != NULL)
|
|
{
|
|
if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN
|
|
&& ent->d_type != DT_LNK)
|
|
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)
|
|
{
|
|
char *conf;
|
|
struct_stat64 st;
|
|
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
|
|
continue;
|
|
|
|
if (ent->d_type != DT_UNKNOWN
|
|
|| (stat64_impl (conf, &st) != -1 && S_ISREG (st.st_mode)))
|
|
found |= read_conf_file (conf, dir, dir_len);
|
|
|
|
free (conf);
|
|
}
|
|
}
|
|
closedir (confdir);
|
|
}
|
|
free (buf);
|
|
return found;
|
|
}
|