#include <errno.h>
#include <limits.h>
#include <sys/stat.h>
+#include <ctype.h>
#include "locale_impl.h"
#include "libc.h"
#include "atomic.h"
struct binding {
struct binding *next;
int dirlen;
- int active;
+ volatile int active;
char *domainname;
char *dirname;
char buf[];
char *bindtextdomain(const char *domainname, const char *dirname)
{
- static int lock[2];
+ static volatile int lock[2];
struct binding *p, *q;
if (!domainname) return 0;
if (!dirname) return gettextdir(domainname, &(size_t){0});
- size_t domlen = strlen(domainname);
- size_t dirlen = strlen(dirname);
+ size_t domlen = strnlen(domainname, NAME_MAX+1);
+ size_t dirlen = strnlen(dirname, PATH_MAX);
if (domlen > NAME_MAX || dirlen >= PATH_MAX) {
errno = EINVAL;
return 0;
}
if (!p) {
- p = malloc(sizeof *p + domlen + dirlen + 2);
+ p = calloc(sizeof *p + domlen + dirlen + 2, 1);
if (!p) {
UNLOCK(lock);
return 0;
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);
}
}
static const char catnames[][12] = {
+ "LC_CTYPE",
+ "LC_NUMERIC",
"LC_TIME",
"LC_COLLATE",
"LC_MONETARY",
"LC_MESSAGES",
};
-static const char catlens[] = { 7, 10, 11, 11 };
+static const char catlens[] = { 8, 10, 7, 10, 11, 11 };
struct msgcat {
struct msgcat *next;
const void *map;
size_t map_size;
+ void *volatile plural_rule;
+ volatile int nplurals;
char name[];
};
const unsigned char *__map_file(const char *, size_t *);
int __munmap(void *, size_t);
+unsigned long __pleval(const char *, unsigned long);
char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n, int category)
{
static struct msgcat *volatile cats;
struct msgcat *p;
struct __locale_struct *loc = CURRENT_LOCALE;
- struct __locale_map *lm;
+ const struct __locale_map *lm;
const char *dirname, *locname, *catname;
size_t dirlen, loclen, catlen, domlen;
+ if ((unsigned)category >= LC_ALL) goto notrans;
+
if (!domainname) domainname = __gettextdomain();
- domlen = strlen(domainname);
+ domlen = strnlen(domainname, NAME_MAX+1);
if (domlen > NAME_MAX) goto notrans;
dirname = gettextdir(domainname, &dirlen);
if (!dirname) goto notrans;
- switch (category) {
- case LC_MESSAGES:
- locname = loc->messages_name;
- if (!*locname) goto notrans;
- break;
- case LC_TIME:
- case LC_MONETARY:
- case LC_COLLATE:
- lm = loc->cat[category-2];
- if (!lm) goto notrans;
- locname = lm->name;
- break;
- default:
+ lm = loc->cat[category];
+ if (!lm) {
notrans:
return (char *) ((n == 1) ? msgid1 : msgid2);
}
+ locname = lm->name;
- catname = catnames[category-2];
- catlen = catlens[category-2];
+ catname = catnames[category];
+ catlen = catlens[category];
loclen = strlen(locname);
size_t namelen = dirlen+1 + loclen+1 + catlen+1 + domlen+3;
size_t map_size;
const void *map = __map_file(name, &map_size);
if (!map) goto notrans;
- p = malloc(sizeof *p + namelen + 1);
+ p = calloc(sizeof *p + namelen + 1, 1);
if (!p) {
__munmap((void *)map, map_size);
goto notrans;
const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
if (!trans) goto notrans;
- /* FIXME: support alternate plural rules */
- if (n != 1) {
- size_t l = strlen(trans);
- if (l+1 >= p->map_size - (trans - (char *)p->map))
- goto notrans;
- trans += l+1;
+ /* Non-plural-processing gettext forms pass a null pointer as
+ * msgid2 to request that dcngettext suppress plural processing. */
+ if (!msgid2) return (char *)trans;
+
+ if (!p->plural_rule) {
+ const char *rule = "n!=1;";
+ unsigned long np = 2;
+ const char *r = __mo_lookup(p->map, p->map_size, "");
+ char *z;
+ while (r && strncmp(r, "Plural-Forms:", 13)) {
+ z = strchr(r, '\n');
+ r = z ? z+1 : 0;
+ }
+ if (r) {
+ r += 13;
+ while (isspace(*r)) r++;
+ if (!strncmp(r, "nplurals=", 9)) {
+ np = strtoul(r+9, &z, 10);
+ r = z;
+ }
+ while (*r && *r != ';') r++;
+ if (*r) {
+ r++;
+ while (isspace(*r)) r++;
+ if (!strncmp(r, "plural=", 7))
+ rule = r+7;
+ }
+ }
+ a_store(&p->nplurals, np);
+ a_cas_p(&p->plural_rule, 0, (void *)rule);
+ }
+ if (p->nplurals) {
+ unsigned long plural = __pleval(p->plural_rule, n);
+ if (plural > p->nplurals) goto notrans;
+ while (plural--) {
+ size_t rem = p->map_size - (trans - (char *)p->map);
+ size_t l = strnlen(trans, rem);
+ if (l+1 >= rem)
+ goto notrans;
+ trans += l+1;
+ }
}
return (char *)trans;
}
char *dcgettext(const char *domainname, const char *msgid, int category)
{
- return dcngettext(domainname, msgid, msgid, 1, category);
+ return dcngettext(domainname, msgid, 0, 1, category);
}
char *dngettext(const char *domainname, const char *msgid1, const char *msgid2, unsigned long int n)
char *dgettext(const char *domainname, const char *msgid)
{
- return dcngettext(domainname, msgid, msgid, 1, LC_MESSAGES);
+ return dcngettext(domainname, msgid, 0, 1, LC_MESSAGES);
}
projects / musl / blobdiff