summaryrefslogtreecommitdiff
path: root/intl/loadinfo.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-09-26 04:45:24 +0000
committerUlrich Drepper <drepper@redhat.com>2004-09-26 04:45:24 +0000
commitce7265c7438e18f2e4ea81582131a783a1cdd601 (patch)
treede765fda756af9cf90b3d7d3c528ac0c11f93de9 /intl/loadinfo.h
parentf6b90f42997f98bdd91dac713d610b66edc55c7c (diff)
[BZ #322]
Update. * intl/dcigettext.c (DCIGETTEXT): Protect tfind/tsearch calls. * intl/dcigettext.c (_nl_find_msg): Call _nl_load_domain also if decided < 0. * intl/finddomain.c (_nl_find_domain): Likewise. * intl/l10nflist.c (_nl_make_l10nflist): Initialize lock. * intl/loadinfo.h (struct loaded_l10nfile): Add lock element. * intl/loadmsgcat.c (_nl_load_domain): Set decided to 1 only once we are done. First set to -1 to signal initialization is ongoing. Protect against concurrent callers with recursive lock. duplicate address recognition does not copy junk. [BZ #322]
Diffstat (limited to 'intl/loadinfo.h')
-rw-r--r--intl/loadinfo.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/intl/loadinfo.h b/intl/loadinfo.h
index c2b6971b36..913022eb7b 100644
--- a/intl/loadinfo.h
+++ b/intl/loadinfo.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -20,6 +20,8 @@
#ifndef _LOADINFO_H
#define _LOADINFO_H 1
+#include <bits/libc-lock.h>
+
/* Declarations of locale dependent catalog lookup functions.
Implemented in
@@ -61,6 +63,7 @@ struct loaded_l10nfile
{
const char *filename;
int decided;
+ __libc_lock_define_recursive (, lock);
const void *data;