From: Arjun Shankar <arjun@redhat.com>
Date: Thu, 24 Feb 2022 20:43:09 +0000 (+0100)
Subject: localedef: Handle symbolic links when generating locale-archive
X-Git-Tag: glibc-2.36~649
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea89d5bbd9e5e514b606045d909e6ab87d851c88;p=thirdparty%2Fglibc.git

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>
---

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index 45408c26c16..eeb2fa6ffec 100644
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -1397,7 +1397,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);