paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-16 08:06:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

* timezone.inc dep for linux.ppu

Browse Source 
* fixed sigsegvs with wrong timezone settigns
This commit is contained in:
peter 1999-12-02 11:25:31 +00:00
parent 20d054f098
commit e85d23980b
3 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/linux/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:51
# Makefile generated by fpcmake v0.99.13 on 1999-12-02 12:06
#
defaultrule: all
@ -1081,7 +1081,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
#
linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
syscalls.inc systypes.inc sysconst.inc $(SYSTEMPPU)
syscalls.inc systypes.inc sysconst.inc timezone.inc $(SYSTEMPPU)
ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT)

2
rtl/linux/Makefile.fpc
View File

@ -119,7 +119,7 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
#
linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
syscalls.inc systypes.inc sysconst.inc $(SYSTEMPPU)
syscalls.inc systypes.inc sysconst.inc timezone.inc $(SYSTEMPPU)
ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT)

49
rtl/linux/timezone.inc
View File

@ -72,25 +72,32 @@ var
info : pttinfo;
i : longint;
begin
{ reset }
TZDaylight:=false;
TZSeconds:=0;
TZName[false]:=nil;
TZName[true]:=nil;
leap_correct:=0;
leap_hit:=0;
{ get info }
info:=find_transition(timer);
if not assigned(info) then
exit;
TZDaylight:=info^.isdst;
TZSeconds:=info^.offset;
i:=0;
while (i<num_types) and (i<2) do
while (i<num_types) do
begin
tzname[types[i].isdst]:=@zone_names[types[i].idx];
inc(i);
end;
tzname[info^.isdst]:=@zone_names[info^.idx];
leap_correct:=0;
leap_hit:=0;
i:=num_leaps;
while (i>0) do
begin
if (timer>leaps[i].transition) then
break;
dec(i);
end;
repeat
if i=0 then
exit;
dec(i);
until (timer>leaps[i].transition);
leap_correct:=leaps[i].change;
if (timer=leaps[i].transition) and
(((i=0) and (leaps[i].change>0)) or
@ -246,16 +253,28 @@ end;
procedure DoneLocalTime;
begin
freemem(transitions);
freemem(type_idxs);
freemem(types);
freemem(zone_names);
freemem(leaps);
if assigned(transitions) then
freemem(transitions);
if assigned(type_idxs) then
freemem(type_idxs);
if assigned(types) then
freemem(types);
if assigned(zone_names) then
freemem(zone_names);
if assigned(leaps) then
freemem(leaps);
num_transitions:=0;
num_leaps:=0;
num_types:=0;
end;
{
$Log$
Revision 1.1 1999-12-01 22:46:59 peter
Revision 1.2 1999-12-02 11:25:31 peter
* timezone.inc dep for linux.ppu
* fixed sigsegvs with wrong timezone settigns
Revision 1.1 1999/12/01 22:46:59 peter
+ timezone support
}