aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArjun Shankar <arjun@redhat.com>2022-02-24 21:43:09 +0100
committerArjun Shankar <arjun@redhat.com>2022-03-03 11:58:03 +0100
commit852361b5a32fafb1aafb6467c7c567063fd99d44 (patch)
tree0e57f38e0438806f6c732d828a8710f53409292e
parentd5d1c95aafb6f4bfc8930d6cef75b758e03c6494 (diff)
downloadglibc-852361b5a32fafb1aafb6467c7c567063fd99d44.tar
glibc-852361b5a32fafb1aafb6467c7c567063fd99d44.tar.gz
glibc-852361b5a32fafb1aafb6467c7c567063fd99d44.tar.bz2
glibc-852361b5a32fafb1aafb6467c7c567063fd99d44.zip
localedef: Handle symbolic links when generating locale-archive
Whenever locale data for any locale included symbolic links, localedef would throw the error "incomplete set of locale files" and exclude it from the generated locale archive. This commit fixes that. Co-authored-by: Florian Weimer <fweimer@redhat.com> Reviewed-by: Carlos O'Donell <carlos@redhat.com> (cherry picked from commit ea89d5bbd9e5e514b606045d909e6ab87d851c88)
-rw-r--r--locale/programs/locarchive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index f38e835c52..d79278b6ed 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -1391,7 +1391,7 @@ add_locales_to_archive (size_t nlist, char *list[], bool replace)
{
char fullname[fnamelen + 2 * strlen (d->d_name) + 7];
- if (d_type == DT_UNKNOWN)
+ if (d_type == DT_UNKNOWN || d_type == DT_LNK)
{
strcpy (stpcpy (stpcpy (fullname, fname), "/"),
d->d_name);