paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 01:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed datetime related routines for unix

Browse Source 
git-svn-id: trunk@444 -
This commit is contained in:
Jonas Maebe 2005-06-19 14:49:37 +00:00
parent c92377604c
commit 437f35315c
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtl/objpas/sysutils/dati.inc
View File

@ -720,6 +720,7 @@ Var YY,MM,DD,H,m,s,msec : Word;
begin begin
Decodedate (DateTime,YY,MM,DD); Decodedate (DateTime,YY,MM,DD);
{$ifndef unix}
If (YY<1980) or (YY>2099) then If (YY<1980) or (YY>2099) then
Result:=0 Result:=0
else else
@ -728,11 +729,16 @@ begin
Result:=(s shr 1) or (m shl 5) or (h shl 11); Result:=(s shr 1) or (m shl 5) or (h shl 11);
Result:=Result or DD shl 16 or (MM shl 21) or ((YY-1980) shl 25); Result:=Result or DD shl 16 or (MM shl 21) or ((YY-1980) shl 25);
end; end;
{$else unix}
Decodetime(DateTime,h,m,s,msec);
Result:=LocalToEpoch(yy,mm,dd,h,m,s);
{$endif unix}
end; end;
Function FileDateToDateTime (Filedate : Longint) : TDateTime; Function FileDateToDateTime (Filedate : Longint) : TDateTime;
{$ifndef unix}
Var Date,Time : Word; Var Date,Time : Word;
begin begin
@ -741,6 +747,14 @@ begin
Result:=EncodeDate((Date shr 9) + 1980,(Date shr 5) and 15, Date and 31) + Result:=EncodeDate((Date shr 9) + 1980,(Date shr 5) and 15, Date and 31) +
EncodeTime(Time shr 11, (Time shr 5) and 63, (Time and 31) shl 1,0); EncodeTime(Time shr 11, (Time shr 5) and 63, (Time and 31) shl 1,0);
end; end;
{$else unix}
var
y, mon, d, h, min, s: word;
begin
EpochToLocal(FileDate,y,mon,d,h,min,s);
Result:=EncodeDate(y,mon,d) + EncodeTime(h,min,s,0);
end;
{$endif unix}
function TryStrToDate(const S: string; out Value: TDateTime): Boolean; function TryStrToDate(const S: string; out Value: TDateTime): Boolean;

2
rtl/unix/sysutils.pp
View File

@ -40,7 +40,7 @@ Procedure AddDisk(const path:string);
implementation implementation
Uses Uses
{$ifdef FPC_USE_LIBC}initc{$ELSE}Syscall{$ENDIF}, Baseunix; {$ifdef FPC_USE_LIBC}initc{$ELSE}Syscall{$ENDIF}, Baseunix, unixutil;
{$Define OS_FILEISREADONLY} // Specific implementation for Unix. {$Define OS_FILEISREADONLY} // Specific implementation for Unix.