From: Tom Tromey <tromey@redhat.com>
Date: Mon, 11 Nov 2002 22:22:31 +0000 (+0000)
Subject: dostime.c (dos2unixtime): Mask for seconds is 0x1f.
X-Git-Tag: releases/gcc-3.2.1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13390032ad538548c9a90e144a295b23724b6844;p=thirdparty%2Fgcc.git

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

	* 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: r59029
---

diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog
index 4c2d85cfc3db..58ebb1b5161c 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-07  Tom Tromey  <tromey@redhat.com>
 
 	* dostime.c: Rewrote from scratch.
diff --git a/fastjar/dostime.c b/fastjar/dostime.c
index b3c76e522025..5117a82014ec 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);