diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-11 22:20:56 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-11 22:20:56 +0000 |
| commit | c005ac22c1e5ae043731a536182b05cb3315447b (patch) | |
| tree | 7ede7b92af25472f234c9fbc72532e09c8aadda5 /fastjar | |
| parent | 35fc9da77bfd1654bc1cd416592a307a6c3a70ab (diff) | |
| download | gcc-c005ac22c1e5ae043731a536182b05cb3315447b.tar.gz | |
* dostime.c (dos2unixtime): Mask for seconds is 0x1f. Correctly
compute month.
(unix2dostime): Handle years before 1980. Correctly compute month
and day of month.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59027 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fastjar')
| -rw-r--r-- | fastjar/ChangeLog | 7 | ||||
| -rw-r--r-- | fastjar/dostime.c | 13 |
2 files changed, 15 insertions, 5 deletions
diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 4567ee32a4c..5adc87d3db6 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,10 @@ +2002-11-11 Tom Tromey <tromey@redhat.com> + + * dostime.c (dos2unixtime): Mask for seconds is 0x1f. Correctly + compute month. + (unix2dostime): Handle years before 1980. Correctly compute month + and day of month. + 2002-11-10 Jakub Jelinek <jakub@redhat.com> * jartool.c (add_to_jar): Only compare file to jarfile if jarfile is diff --git a/fastjar/dostime.c b/fastjar/dostime.c index b3c76e52202..5117a82014e 100644 --- a/fastjar/dostime.c +++ b/fastjar/dostime.c @@ -49,11 +49,11 @@ dos2unixtime (unsigned long dostime) ltime = *localtime (&now); ltime.tm_year = (dostime >> 25) + 80; - ltime.tm_mon = 1 + ((dostime >> 21) & 0x0f); + ltime.tm_mon = ((dostime >> 21) & 0x0f) - 1; ltime.tm_mday = (dostime >> 16) & 0x1f; ltime.tm_hour = (dostime >> 11) & 0x0f; ltime.tm_min = (dostime >> 5) & 0x3f; - ltime.tm_sec = (dostime & 0x0f) << 1; + ltime.tm_sec = (dostime & 0x1f) << 1; ltime.tm_wday = -1; ltime.tm_yday = -1; @@ -66,10 +66,13 @@ unsigned long unix2dostime (time_t *time) { struct tm *ltime = localtime (time); + int year = ltime->tm_year - 80; + if (year < 0) + year = 0; - return ((ltime->tm_year - 80) << 25 - | ltime->tm_mon << 21 - | (ltime->tm_mday - 1) << 16 + return (year << 25 + | (ltime->tm_mon + 1) << 21 + | ltime->tm_mday << 16 | ltime->tm_hour << 11 | ltime->tm_min << 5 | ltime->tm_sec >> 1); |