From 8d82971775343f3c52294e957c52ad1f758395ef Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 27 Jan 2019 21:34:57 -0600 Subject: [PATCH] locale: ensure dcngettext() preserves errno Some packages call gettext to format a message to be sent to perror. If the currently set user locale points to a non-existent .mo file, open via __map_file in dcngettext will set errno to ENOENT. Maintainer's notes: Non-modification of errno is a documented part of the interface contract for the GNU version of this function and likely other versions. The issue being fixed here seems to be a regression from commit 1b52863e244ecee5b5935b6d36bb9e6efe84c035, which enabled setting of errno from __map_file. --- src/locale/dcngettext.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c index 8b891d00..4c304393 100644 --- a/src/locale/dcngettext.c +++ b/src/locale/dcngettext.c @@ -122,6 +122,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, const struct __locale_map *lm; size_t domlen; struct binding *q; + int old_errno = errno; if ((unsigned)category >= LC_ALL) goto notrans; @@ -138,6 +139,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, lm = loc->cat[category]; if (!lm) { notrans: + errno = old_errno; return (char *) ((n == 1) ? msgid1 : msgid2); } @@ -250,6 +252,7 @@ notrans: trans += l+1; } } + errno = old_errno; return (char *)trans; } -- 2.11.4.GIT