public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Arjun Shankar <arjun@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] localedef: Handle symbolic links when generating locale-archive Date: Thu, 3 Mar 2022 11:35:42 +0000 (GMT) [thread overview] Message-ID: <20220303113542.B7AC1385842A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=852361b5a32fafb1aafb6467c7c567063fd99d44 commit 852361b5a32fafb1aafb6467c7c567063fd99d44 Author: Arjun Shankar <arjun@redhat.com> Date: Thu Feb 24 21:43:09 2022 +0100 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) Diff: --- locale/programs/locarchive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);
reply other threads:[~2022-03-03 11:35 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220303113542.B7AC1385842A@sourceware.org \ --to=arjun@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).