OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dostime.c (dos2unixtime): Mask for seconds is 0x1f.

Browse Source 
* dostime.c (dos2unixtime): Mask for seconds is 0x1f.  Correctly
	compute month.
	(unix2dostime): Handle years before 1980.  Correctly compute month
	and day of month.

From-SVN: r59027
This commit is contained in:
Tom Tromey 2002-11-11 22:20:56 +00:00 committed by Tom Tromey
parent 303b90b001
commit 90e76e864a
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fastjar/ChangeLog
View File

@ -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> 2002-11-10 Jakub Jelinek <jakub@redhat.com>
* jartool.c (add_to_jar): Only compare file to jarfile if jarfile is * jartool.c (add_to_jar): Only compare file to jarfile if jarfile is

13
fastjar/dostime.c
View File

@ -49,11 +49,11 @@ dos2unixtime (unsigned long dostime)
ltime = *localtime (&now); ltime = *localtime (&now);
ltime.tm_year = (dostime >> 25) + 80; 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_mday = (dostime >> 16) & 0x1f;
ltime.tm_hour = (dostime >> 11) & 0x0f; ltime.tm_hour = (dostime >> 11) & 0x0f;
ltime.tm_min = (dostime >> 5) & 0x3f; ltime.tm_min = (dostime >> 5) & 0x3f;
ltime.tm_sec = (dostime & 0x0f) << 1; ltime.tm_sec = (dostime & 0x1f) << 1;
ltime.tm_wday = -1; ltime.tm_wday = -1;
ltime.tm_yday = -1; ltime.tm_yday = -1;
@ -66,10 +66,13 @@ unsigned long
unix2dostime (time_t *time) unix2dostime (time_t *time)
{ {
struct tm *ltime = localtime (time); struct tm *ltime = localtime (time);
int year = ltime->tm_year - 80;
if (year < 0)
year = 0;
return ((ltime->tm_year - 80) << 25 return (year << 25
| ltime->tm_mon << 21 | (ltime->tm_mon + 1) << 21
| (ltime->tm_mday - 1) << 16 | ltime->tm_mday << 16
| ltime->tm_hour << 11 | ltime->tm_hour << 11
| ltime->tm_min << 5 | ltime->tm_min << 5
| ltime->tm_sec >> 1); | ltime->tm_sec >> 1);