diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-03-20 15:25:48 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-03-21 08:15:29 +0200 |
| commit | 1a4d299a0242a02aa0d4843dd9947d4187e70414 (patch) | |
| tree | 524965445ca8c9eba7f425db6ffb2035d8025500 /main/musl/0007-fix-bindtextdomain-logic-error-deactivating-other-do.patch | |
| parent | c12931e8863fa9fddc90390db24a4a591f43043e (diff) | |
| download | aports-1a4d299a0242a02aa0d4843dd9947d4187e70414.tar.bz2 aports-1a4d299a0242a02aa0d4843dd9947d4187e70414.tar.xz | |
main/musl: cherry-pick upstream fixes
ldso changes (lazy emulation etc) are not stable yet, so it's
are not included. the missing patch numbers are for those commits.
Diffstat (limited to 'main/musl/0007-fix-bindtextdomain-logic-error-deactivating-other-do.patch')
| -rw-r--r-- | main/musl/0007-fix-bindtextdomain-logic-error-deactivating-other-do.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/main/musl/0007-fix-bindtextdomain-logic-error-deactivating-other-do.patch b/main/musl/0007-fix-bindtextdomain-logic-error-deactivating-other-do.patch new file mode 100644 index 0000000000..bacb3bc8e8 --- /dev/null +++ b/main/musl/0007-fix-bindtextdomain-logic-error-deactivating-other-do.patch @@ -0,0 +1,30 @@ +From 01e6bbece2bdcac243cdb8dff6916f2bb80a19e1 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Sun, 29 Jan 2017 00:11:23 -0500 +Subject: [PATCH] fix bindtextdomain logic error deactivating other domains + +this loop was only supposed to deactivate other bindings for the same +text domain name, but due to copy-and-paste error, deactivated all +other bindings. + +patch by He X. +--- + src/locale/dcngettext.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c +index a5ff8475..e48c50f0 100644 +--- a/src/locale/dcngettext.c ++++ b/src/locale/dcngettext.c +@@ -74,7 +74,7 @@ char *bindtextdomain(const char *domainname, const char *dirname) + a_store(&p->active, 1); + + for (q=bindings; q; q=q->next) { +- if (!strcmp(p->domainname, domainname) && q != p) ++ if (!strcmp(q->domainname, domainname) && q != p) + a_store(&q->active, 0); + } + +-- +2.11.1 + |