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

Minor bugfixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3478 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1998-12-17 09:16:26 +00:00
parent 10a58e5050
commit 94b16e9c18
3 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Thu Dec 17 9:30:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
NSCalendarDate.m: Try to cope gracefully when locale info is not
available and we want to display a date. Use numeric month and
week designations and hard-code am/pm
NSUser.m: include NSProcessInfo.h
Wed Dec 16 20:30:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk> Wed Dec 16 20:30:00 1998 Richard Frith-Macdonald <richard@brainstorm.co.uk>
Various modifications suggested by <mguesdon@sbuilders.com> and Various modifications suggested by <mguesdon@sbuilders.com> and

20
Source/NSCalendarDate.m
View file

@ -819,8 +819,11 @@
else else
months = [locale objectForKey: NSMonthNameArray]; months = [locale objectForKey: NSMonthNameArray];
name = [months objectAtIndex: md-1]; name = [months objectAtIndex: md-1];
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s", if (name)
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s",
[name cString])); [name cString]));
else
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", md));
} }
else else
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", md)); k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", md));
@ -875,8 +878,11 @@
else else
days = [locale objectForKey: NSWeekDayNameArray]; days = [locale objectForKey: NSWeekDayNameArray];
name = [days objectAtIndex: dow]; name = [days objectAtIndex: dow];
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s", if (name)
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%s",
[name cString])); [name cString]));
else
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", dow));
} }
else else
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", dow)); k = VSPRINTF_LENGTH(sprintf(&(buf[j]), "%02d", dow));
@ -917,9 +923,15 @@
++i; ++i;
if (hd >= 12) if (hd >= 12)
ampm = [a objectAtIndex: 1]; if ([a count] > 1)
ampm = [a objectAtIndex: 1];
else
ampm = @"pm";
else else
ampm = [a objectAtIndex: 0]; if ([a count] > 0)
ampm = [a objectAtIndex: 0];
else
ampm = @"am";
k = VSPRINTF_LENGTH(sprintf(&(buf[j]), [ampm cString])); k = VSPRINTF_LENGTH(sprintf(&(buf[j]), [ampm cString]));
j += k; j += k;
} }

1
Source/NSUser.m
View file

@ -29,6 +29,7 @@
#include <Foundation/NSArray.h> #include <Foundation/NSArray.h>
#include <Foundation/NSDictionary.h> #include <Foundation/NSDictionary.h>
#include <Foundation/NSFileManager.h> #include <Foundation/NSFileManager.h>
#include <Foundation/NSProcessInfo.h>
#include <Foundation/NSValue.h> #include <Foundation/NSValue.h>
#include <stdlib.h> // for getenv() #include <stdlib.h> // for getenv()