% July 2003 %
% %
% %
-% Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
#include "MagickCore/exception.h"
#include "MagickCore/exception-private.h"
#include "MagickCore/hashmap.h"
+#include "MagickCore/image-private.h"
#include "MagickCore/locale_.h"
#include "MagickCore/locale-private.h"
#include "MagickCore/log.h"
#include "MagickCore/utility.h"
#include "MagickCore/utility-private.h"
#include "MagickCore/xml-tree.h"
+#include "MagickCore/xml-tree-private.h"
\f
/*
Define declarations.
*/
+#if defined(MAGICKCORE_HAVE_NEWLOCALE) || defined(MAGICKCORE_WINDOWS_SUPPORT)
+# define MAGICKCORE_LOCALE_SUPPORT
+#endif
#define LocaleFilename "locale.xml"
#define MaxRecursionDepth 200
\f
-/*
- Typedef declarations.
-*/
-#if defined(__CYGWIN__)
-typedef struct _locale_t
- *locale_t;
-#endif
-\f
/*
Static declarations.
*/
static SplayTreeInfo
*locale_cache = (SplayTreeInfo *) NULL;
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT)
static volatile locale_t
c_locale = (locale_t) NULL;
#endif
*/
static MagickBooleanType
IsLocaleTreeInstantiated(ExceptionInfo *),
- LoadLocaleCache(const char *,const char *,const char *,const size_t,
- ExceptionInfo *);
+ LoadLocaleCache(SplayTreeInfo *,const char *,const char *,const char *,
+ const size_t,ExceptionInfo *);
\f
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT)
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
static SplayTreeInfo *AcquireLocaleSplayTree(const char *filename,
const char *locale,ExceptionInfo *exception)
{
- const StringInfo
- *option;
-
- LinkedListInfo
- *options;
-
MagickStatusType
status;
if (locale_cache == (SplayTreeInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
status=MagickTrue;
- options=GetLocaleOptions(filename,exception);
- option=(const StringInfo *) GetNextValueInLinkedList(options);
#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
- while (option != (const StringInfo *) NULL)
{
- status&=LoadLocaleCache((const char *) GetStringInfoDatum(option),
- GetStringInfoPath(option),locale,0,exception);
+ const StringInfo
+ *option;
+
+ LinkedListInfo
+ *options;
+
+ options=GetLocaleOptions(filename,exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
- }
-#endif
- options=DestroyLocaleOptions(options);
-#if !defined(MAGICKCORE_ZERO_CONFIGURATION_SUPPORT)
- if (GetNumberOfNodesInSplayTree(locale_cache) == 0)
+ while (option != (const StringInfo *) NULL)
{
- options=GetLocaleOptions("english.xml",exception);
+ status&=LoadLocaleCache(locale_cache,(const char *)
+ GetStringInfoDatum(option),GetStringInfoPath(option),locale,0,
+ exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
- while (option != (const StringInfo *) NULL)
+ }
+ options=DestroyLocaleOptions(options);
+ if (GetNumberOfNodesInSplayTree(locale_cache) == 0)
{
- status&=LoadLocaleCache((const char *) GetStringInfoDatum(option),
- GetStringInfoPath(option),locale,0,exception);
+ options=GetLocaleOptions("english.xml",exception);
option=(const StringInfo *) GetNextValueInLinkedList(options);
+ while (option != (const StringInfo *) NULL)
+ {
+ status&=LoadLocaleCache(locale_cache,(const char *)
+ GetStringInfoDatum(option),GetStringInfoPath(option),locale,0,
+ exception);
+ option=(const StringInfo *) GetNextValueInLinkedList(options);
+ }
+ options=DestroyLocaleOptions(options);
}
- options=DestroyLocaleOptions(options);
- }
+ }
#endif
if (GetNumberOfNodesInSplayTree(locale_cache) == 0)
- status&=LoadLocaleCache(LocaleMap,"built-in",locale,0,exception);
+ status&=LoadLocaleCache(locale_cache,LocaleMap,"built-in",locale,0,
+ exception);
return(locale_cache);
}
\f
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT)
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
ssize_t
n;
-#if defined(MAGICKCORE_HAVE_VFPRINTF_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT) && defined(MAGICKCORE_HAVE_VFPRINTF_L)
{
locale_t
locale;
#endif
}
#else
-#if defined(MAGICKCORE_HAVE_USELOCALE)
+#if defined(MAGICKCORE_LOCALE_SUPPORT) && defined(MAGICKCORE_HAVE_USELOCALE)
{
locale_t
locale,
ssize_t
n;
-#if defined(MAGICKCORE_HAVE_VSNPRINTF_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT) && defined(MAGICKCORE_HAVE_VSNPRINTF_L)
{
locale_t
locale;
#endif
}
#elif defined(MAGICKCORE_HAVE_VSNPRINTF)
-#if defined(MAGICKCORE_HAVE_USELOCALE)
+#if defined(MAGICKCORE_LOCALE_SUPPORT) && defined(MAGICKCORE_HAVE_USELOCALE)
{
locale_t
locale,
}
#endif
-MagickExport char **GetLocaleList(const char *pattern,
- size_t *number_messages,ExceptionInfo *exception)
+MagickExport char **GetLocaleList(const char *pattern,size_t *number_messages,
+ ExceptionInfo *exception)
{
char
**messages;
MagickExport const char *GetLocaleMessage(const char *tag)
{
char
- name[MaxTextExtent];
+ name[MagickLocaleExtent];
const LocaleInfo
*locale_info;
if ((tag == (const char *) NULL) || (*tag == '\0'))
return(tag);
exception=AcquireExceptionInfo();
- (void) FormatLocaleString(name,MaxTextExtent,"%s/",tag);
+ (void) FormatLocaleString(name,MagickLocaleExtent,"%s/",tag);
locale_info=GetLocaleInfo_(name,exception);
exception=DestroyExceptionInfo(exception);
if (locale_info != (const LocaleInfo *) NULL)
ExceptionInfo *exception)
{
char
- path[MaxTextExtent];
+ path[MagickPathExtent];
const char
*element;
assert(filename != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
assert(exception != (ExceptionInfo *) NULL);
- (void) CopyMagickString(path,filename,MaxTextExtent);
+ (void) CopyMagickString(path,filename,MagickPathExtent);
/*
Load XML from configuration files to linked-list.
*/
element=(const char *) GetNextValueInLinkedList(paths);
while (element != (const char *) NULL)
{
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",element,filename);
+ (void) FormatLocaleString(path,MagickPathExtent,"%s%s",element,
+ filename);
(void) LogMagickEvent(LocaleEvent,GetMagickModule(),
"Searching for locale file: \"%s\"",path);
xml=ConfigureFileToStringInfo(path);
{
xml=AcquireStringInfo(0);
SetStringInfoLength(xml,strlen(blob)+1);
- SetStringInfoDatum(xml,(unsigned char *) blob);
+ SetStringInfoDatum(xml,(const unsigned char *) blob);
+ blob=(char *) RelinquishMagickMemory(blob);
SetStringInfoPath(xml,filename);
(void) AppendValueToLinkedList(messages,xml);
}
{
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(locale_info != (LocaleInfo *) NULL);
- assert(locale_info->signature == MagickSignature);
+ assert(locale_info->signature == MagickCoreSignature);
return(locale_info->message);
}
\f
*/
static MagickBooleanType IsLocaleTreeInstantiated(ExceptionInfo *exception)
{
- if (locale_semaphore == (SemaphoreInfo *) NULL)
- ActivateSemaphoreInfo(&locale_semaphore);
- LockSemaphoreInfo(locale_semaphore);
if (locale_cache == (SplayTreeInfo *) NULL)
{
- char
- *locale;
-
- register const char
- *p;
-
- locale=(char *) NULL;
- p=setlocale(LC_CTYPE,(const char *) NULL);
- if (p != (const char *) NULL)
- locale=ConstantString(p);
- if (locale == (char *) NULL)
- locale=GetEnvironmentValue("LC_ALL");
- if (locale == (char *) NULL)
- locale=GetEnvironmentValue("LC_MESSAGES");
- if (locale == (char *) NULL)
- locale=GetEnvironmentValue("LC_CTYPE");
- if (locale == (char *) NULL)
- locale=GetEnvironmentValue("LANG");
- if (locale == (char *) NULL)
- locale=ConstantString("C");
- locale_cache=AcquireLocaleSplayTree(LocaleFilename,locale,exception);
- locale=DestroyString(locale);
+ if (locale_semaphore == (SemaphoreInfo *) NULL)
+ ActivateSemaphoreInfo(&locale_semaphore);
+ LockSemaphoreInfo(locale_semaphore);
+ if (locale_cache == (SplayTreeInfo *) NULL)
+ {
+ char
+ *locale;
+
+ register const char
+ *p;
+
+ locale=(char *) NULL;
+ p=setlocale(LC_CTYPE,(const char *) NULL);
+ if (p != (const char *) NULL)
+ locale=ConstantString(p);
+ if (locale == (char *) NULL)
+ locale=GetEnvironmentValue("LC_ALL");
+ if (locale == (char *) NULL)
+ locale=GetEnvironmentValue("LC_MESSAGES");
+ if (locale == (char *) NULL)
+ locale=GetEnvironmentValue("LC_CTYPE");
+ if (locale == (char *) NULL)
+ locale=GetEnvironmentValue("LANG");
+ if (locale == (char *) NULL)
+ locale=ConstantString("C");
+ locale_cache=AcquireLocaleSplayTree(LocaleFilename,locale,exception);
+ locale=DestroyString(locale);
+ }
+ UnlockSemaphoreInfo(locale_semaphore);
}
- UnlockSemaphoreInfo(locale_semaphore);
return(locale_cache != (SplayTreeInfo *) NULL ? MagickTrue : MagickFalse);
}
\f
value=(double) strtoul(string,&q,16);
else
{
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT) && defined(MAGICKCORE_HAVE_STRTOD_L)
locale_t
locale;
%
% The format of the LoadLocaleCache method is:
%
-% MagickBooleanType LoadLocaleCache(const char *xml,const char *filename,
-% const size_t depth,ExceptionInfo *exception)
+% MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
+% const char *xml,const char *filename,const size_t depth,
+% ExceptionInfo *exception)
%
% A description of each parameter follows:
%
exit(1);
}
-static inline size_t MagickMin(const size_t x,const size_t y)
-{
- if (x < y)
- return(x);
- return(y);
-}
-
-static MagickBooleanType LoadLocaleCache(const char *xml,const char *filename,
- const char *locale,const size_t depth,ExceptionInfo *exception)
+static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache,
+ const char *xml,const char *filename,const char *locale,const size_t depth,
+ ExceptionInfo *exception)
{
char
- keyword[MaxTextExtent],
- message[MaxTextExtent],
- tag[MaxTextExtent],
+ keyword[MagickLocaleExtent],
+ message[MagickLocaleExtent],
+ tag[MagickLocaleExtent],
*token;
const char
LocaleInfo
*locale_info;
- MagickBooleanType
+ MagickStatusType
status;
register char
"Loading locale configure file \"%s\" ...",filename);
if (xml == (const char *) NULL)
return(MagickFalse);
- if (locale_cache == (SplayTreeInfo *) NULL)
- {
- locale_cache=NewSplayTree(CompareSplayTreeString,(void *(*)(void *)) NULL,
- DestroyLocaleNode);
- if (locale_cache == (SplayTreeInfo *) NULL)
- return(MagickFalse);
- }
status=MagickTrue;
locale_info=(LocaleInfo *) NULL;
*tag='\0';
GetMagickToken(q,&q,token);
if (*token == '\0')
break;
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickLocaleExtent);
if (LocaleNCompare(keyword,"<!DOCTYPE",9) == 0)
{
/*
*/
while (((*token != '/') && (*(token+1) != '>')) && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickLocaleExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
else
{
char
- path[MaxTextExtent],
+ path[MagickPathExtent],
*xml;
*path='\0';
GetPathComponent(filename,HeadPath,path);
if (*path != '\0')
(void) ConcatenateMagickString(path,DirectorySeparator,
- MaxTextExtent);
+ MagickPathExtent);
if (*token == *DirectorySeparator)
- (void) CopyMagickString(path,token,MaxTextExtent);
+ (void) CopyMagickString(path,token,MagickPathExtent);
else
- (void) ConcatenateMagickString(path,token,MaxTextExtent);
- xml=FileToString(path,~0UL,exception);
+ (void) ConcatenateMagickString(path,token,MagickPathExtent);
+ xml=FileToXML(path,~0UL);
if (xml != (char *) NULL)
{
- status=LoadLocaleCache(xml,path,locale,depth+1,exception);
+ status&=LoadLocaleCache(locale_cache,xml,path,locale,
+ depth+1,exception);
xml=(char *) RelinquishMagickMemory(xml);
}
}
*/
while ((*token != '>') && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickLocaleExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
if (LocaleCompare(keyword,"</locale>") == 0)
{
ChopLocaleComponents(tag,1);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickLocaleExtent);
continue;
}
if (LocaleCompare(keyword,"<localemap>") == 0)
*/
while ((*token != '>') && (*q != '\0'))
{
- (void) CopyMagickString(keyword,token,MaxTextExtent);
+ (void) CopyMagickString(keyword,token,MagickLocaleExtent);
GetMagickToken(q,&q,token);
if (*token != '=')
continue;
GetMagickToken(q,&q,token);
if (LocaleCompare(keyword,"name") == 0)
{
- (void) ConcatenateMagickString(tag,token,MaxTextExtent);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,token,MagickLocaleExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickLocaleExtent);
}
}
for (p=(char *) q; (*q != '<') && (*q != '\0'); q++) ;
while ((isspace((int) ((unsigned char) *q)) != 0) && (q > p))
q--;
(void) CopyMagickString(message,p,MagickMin((size_t) (q-p+2),
- MaxTextExtent));
+ MagickLocaleExtent));
locale_info=(LocaleInfo *) AcquireMagickMemory(sizeof(*locale_info));
if (locale_info == (LocaleInfo *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
locale_info->path=ConstantString(filename);
locale_info->tag=ConstantString(tag);
locale_info->message=ConstantString(message);
- locale_info->signature=MagickSignature;
+ locale_info->signature=MagickCoreSignature;
status=AddValueToSplayTree(locale_cache,locale_info->tag,locale_info);
if (status == MagickFalse)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
locale_info->tag);
- (void) ConcatenateMagickString(tag,message,MaxTextExtent);
- (void) ConcatenateMagickString(tag,"\n",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,message,MagickLocaleExtent);
+ (void) ConcatenateMagickString(tag,"\n",MagickLocaleExtent);
q++;
continue;
}
if (LocaleCompare(keyword,"</message>") == 0)
{
ChopLocaleComponents(tag,2);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickLocaleExtent);
continue;
}
if (*keyword == '<')
{
ChopLocaleComponents(tag,1);
if (*tag != '\0')
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickLocaleExtent);
continue;
}
token[strlen(token)-1]='\0';
- (void) CopyMagickString(token,token+1,MaxTextExtent);
- (void) ConcatenateMagickString(tag,token,MaxTextExtent);
- (void) ConcatenateMagickString(tag,"/",MaxTextExtent);
+ (void) CopyMagickString(token,token+1,MagickLocaleExtent);
+ (void) ConcatenateMagickString(tag,token,MagickLocaleExtent);
+ (void) ConcatenateMagickString(tag,"/",MagickLocaleExtent);
continue;
}
GetMagickToken(q,(const char **) NULL,token);
}
token=(char *) RelinquishMagickMemory(token);
(void) SetFatalErrorHandler(fatal_handler);
- return(status);
+ return(status != 0 ? MagickTrue : MagickFalse);
}
\f
/*
*/
MagickPrivate MagickBooleanType LocaleComponentGenesis(void)
{
- locale_semaphore=AcquireSemaphoreInfo();
+ if (locale_semaphore == (SemaphoreInfo *) NULL)
+ locale_semaphore=AcquireSemaphoreInfo();
return(MagickTrue);
}
\f
LockSemaphoreInfo(locale_semaphore);
if (locale_cache != (SplayTreeInfo *) NULL)
locale_cache=DestroySplayTree(locale_cache);
-#if defined(MAGICKCORE_HAVE_STRTOD_L)
+#if defined(MAGICKCORE_LOCALE_SUPPORT)
DestroyCLocale();
#endif
UnlockSemaphoreInfo(locale_semaphore);
projects / imagemagick / blobdiff