Browse Source

* Patch from Bernd to fix SedDateTime (wrong tv_usec values, bug ID #27969)

git-svn-id: trunk@30728 -
michael 10 years ago
parent
commit
8196427ca6
1 changed files with 4 additions and 1 deletions
  1. 4 1
      rtl/unix/dos.pp

+ 4 - 1
rtl/unix/dos.pp

@@ -245,6 +245,7 @@ var
 begin
 begin
   GetDate (Year, Month, Day,dow);
   GetDate (Year, Month, Day,dow);
   tv.tv_sec:= LocalToEpoch ( Year, Month, Day, Hour, Minute, Second ) ;
   tv.tv_sec:= LocalToEpoch ( Year, Month, Day, Hour, Minute, Second ) ;
+  tv.tv_usec:= Sec100 * 10000;
   fpSettimeofday(@tv,nil);
   fpSettimeofday(@tv,nil);
 end;
 end;
 
 
@@ -255,6 +256,7 @@ var
 begin
 begin
   GetTime ( Hour, Min, Sec, Sec100 );
   GetTime ( Hour, Min, Sec, Sec100 );
   tv.tv_sec:= LocalToEpoch ( Year, Month, Day, Hour, Min, Sec ) ;
   tv.tv_sec:= LocalToEpoch ( Year, Month, Day, Hour, Min, Sec ) ;
+  tv.tv_usec:= Sec100 * 10000;
   fpSettimeofday(@tv,nil);
   fpSettimeofday(@tv,nil);
 end;
 end;
 
 
@@ -264,6 +266,7 @@ var
   tv : timeval;
   tv : timeval;
 begin
 begin
   tv.tv_sec:= LocalToEpoch ( Year, Month, Day, Hour, Minute, Second ) ;
   tv.tv_sec:= LocalToEpoch ( Year, Month, Day, Hour, Minute, Second ) ;
+  tv.tv_usec:= 0;
   SetDatetime:=fpSettimeofday(@tv,nil)=0;
   SetDatetime:=fpSettimeofday(@tv,nil)=0;
 end;
 end;
 
 
@@ -319,7 +322,7 @@ Begin
     begin
     begin
       doserror:=2;
       doserror:=2;
       exit;
       exit;
-    end;  
+    end;
   pid:=fpFork;
   pid:=fpFork;
   if pid=0 then
   if pid=0 then
    begin
    begin