gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix possible locale related probem with decimal separator.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26979 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2008-10-27 17:13:31 +00:00
parent 23cf7ffdf8
commit c9010d3ee0
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-10-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSFormat.m: Fix possible problem when current unix locale
does not use '.' as the decimal separator.
2008-10-27 Nicola Pero <nicola.pero@meta-innovation.com>
* Headers/Foundation/NSFileManager.h: Fixed typo - declare NSError

42
Source/GSFormat.m
View file

@ -793,6 +793,27 @@ static inline void GSStrAppendUnichar(GSStr s, unichar u)
# define is_long_num is_long
#endif
static NSString *locale_sep()
{
static NSString *sep = nil;
if (sep == nil)
{
char buf[32];
char *from = buf;
char *to;
sprintf(buf, "%g", 1.2);
if (*from == '1') from++;
to = from;
while (*to != '\0' && *to != '2')
to++;
*to = '\0';
sep = [[NSString alloc] initWithCString: from];
}
return sep;
}
/* Global variables. */
static const unichar null[] = {'(','n','u','l','l',')','\0'};
@ -1477,22 +1498,8 @@ NSDictionary *locale)
*/
if (decimal_sep != nil)
{
static NSString *sep = nil;
NSString *sep = locale_sep();
if (sep == nil)
{
char buf[32];
char *from = buf;
char *to;
sprintf(buf, "%g", 1.2);
if (*from == '1') from++;
to = from;
while (*to != '\0' && *to != '2')
to++;
*to = '\0';
sep = [[NSString alloc] initWithCString: from];
}
if ([decimal_sep isEqual: sep] == NO && [sep length] == 1)
{
unichar m = [sep characterAtIndex: 0];
@ -1609,11 +1616,8 @@ NSDictionary *locale)
*/
if (decimal_sep != nil)
{
NSDictionary *def = GSDomainFromDefaultLocale();
NSString *sep = [def objectForKey: NSDecimalSeparator];
NSString *sep = locale_sep();
if (sep == nil)
sep = @".";
if ([decimal_sep isEqual: sep] == NO && [sep length] == 1)
{
unichar m = [sep characterAtIndex: 0];