Changeset 3709 for branches/libc-0.6

Timestamp:

Mar 17, 2011, 2:00:53 AM (14 years ago)

Author:

bird

Message:

libc_back_timeUnix2FileTime: Dates prior to 1980 will be set to 1980-01-01T00:00:00. Fixes #198.

File:

• branches/libc-0.6/src/emx/src/lib/sys/b_time.c (modified) (4 diffs)

branches/libc-0.6/src/emx/src/lib/sys/b_time.c

@@ -7 +7 @@
  *
  *
- * This file is part of kBuild.
+ * This file is part of kLIBC.
  *
- * kBuild is free software; you can redistribute it and/or modify
+ * kLIBC is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * kBuild is distributed in the hope that it will be useful,
+ * kLIBC is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20 +20 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with kBuild; if not, write to the Free Software
+ * along with kLIBC; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-
 
 /*******************************************************************************
@@ -34 +33 @@
 #include "b_time.h"
 #include <time.h>
+#include <emx/time.h>
 
 
@@ -46 +46 @@
 {
     struct tm Tm;
+    
+    if (!_tzset_flag)
+        tzset();
     gmtime_r(&Time, &Tm);
-#if 0                                   /* This didn't work in GCC versions <= 2.4 */
-    time->twosecs   = Tm.tm_sec / 2;
-    time->minutes   = Tm.tm_min;
-    time->hours     = Tm.tm_hour;
-    date->day       = Tm.tm_mday;
-    date->month     = Tm.tm_mon + 1;
-    date->year      = Tm.tm_year - 1980 + 1900;
-#else
-    USHORT us = (Tm.tm_sec / 2) + (Tm.tm_min << 5) + (Tm.tm_hour << 11);
-    *(PUSHORT)pTime = us;
-    us = Tm.tm_mday + ((Tm.tm_mon + 1) << 5) + ((Tm.tm_year - 80) << 9);
-    *(PUSHORT)pDate = us;
-#endif
+    
+    if (Tm.tm_year >= 80)
+    {
+        pTime->twosecs   = Tm.tm_sec / 2;
+        pTime->minutes   = Tm.tm_min;
+        pTime->hours     = Tm.tm_hour;
+        pDate->day       = Tm.tm_mday;
+        pDate->month     = Tm.tm_mon + 1;
+        pDate->year      = Tm.tm_year - 1980 + 1900;
+    }
+    else
+    {
+        pTime->twosecs   = 0;
+        pTime->minutes   = 0;
+        pTime->hours     = 0;
+        pDate->day       = 1;
+        pDate->month     = 1;
+        pDate->year      = 0;
+    }
 }