diff options
| author | Hristian Kirtchev <kirtchev@adacore.com> | 2007-08-14 10:47:45 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2007-08-14 10:47:45 +0200 |
| commit | 154c16575f0f10392d3798f6470eb0951084ea6c (patch) | |
| tree | a400013a9a93fbd7182e987420beb5dc83c31ca0 /gcc | |
| parent | bfc2cdb1e73647b7f9a53649a63623f91b2c3207 (diff) | |
| download | gcc-154c16575f0f10392d3798f6470eb0951084ea6c.zip gcc-154c16575f0f10392d3798f6470eb0951084ea6c.tar.gz gcc-154c16575f0f10392d3798f6470eb0951084ea6c.tar.bz2 | |
g-catiio.adb (Image): For the case of %s...
2007-08-14 Hristian Kirtchev <kirtchev@adacore.com>
* g-catiio.adb (Image): For the case of %s, use Ada.Calendar.Time
values to compute the number of seconds since the Unix Epoc in order to
account for Daylight Savings Time. Perform special processing for dates
that are earlier than the Unix Epoc to obtain a negative number.
From-SVN: r127450
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/g-catiio.adb | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/gcc/ada/g-catiio.adb b/gcc/ada/g-catiio.adb index f0174d5..5286ef0 100644 --- a/gcc/ada/g-catiio.adb +++ b/gcc/ada/g-catiio.adb @@ -306,15 +306,33 @@ package body GNAT.Calendar.Time_IO is when 's' => declare - Sec : constant Sec_Number := - Sec_Number (Julian_Day (Year, Month, Day) - - Julian_Day (1970, 1, 1)) * 86_400 - + Sec_Number (Hour) * 3_600 - + Sec_Number (Minute) * 60 - + Sec_Number (Second); + -- Compute the number of seconds using Ada.Calendar.Time + -- values rather than Julian days to account for Daylight + -- Savings Time. + + Neg : Boolean := False; + Sec : Duration := Date - Time_Of (1970, 1, 1, 0.0); begin - Result := Result & Image (Sec, None); + -- Avoid rounding errors and perform special processing + -- for dates earlier than the Unix Epoc. + + if Sec > 0.0 then + Sec := Sec - 0.5; + elsif Sec < 0.0 then + Neg := True; + Sec := abs (Sec + 0.5); + end if; + + -- Prepend a minus sign to the result since Sec_Number + -- cannot handle negative numbers. + + if Neg then + Result := + Result & "-" & Image (Sec_Number (Sec), None); + else + Result := Result & Image (Sec_Number (Sec), None); + end if; end; -- Second (00..59) |