ftime.c.diff

*** ./ftime.c.orig	Tue Jun 16 23:00:00 1998
--- ./ftime.c	Thu Feb 01 23:36:23 2001
***************
*** 1,194 ****
! /***
! *ftime.c - return system time
! *
! *       Copyright (c) 1985-1998, Microsoft Corporation. All rights reserved.
! *
! *Purpose:
! *       Returns the system date/time in a structure form.
! *
! *******************************************************************************/
  
! #ifdef _WIN32
! 
! 
! 
! #include <cruntime.h>
  #include <sys/types.h>
  #include <sys/timeb.h>
  #include <time.h>
! #include <dostypes.h>
! #include <msdos.h>
! #include <dos.h>
! #include <stdlib.h>
! #include <windows.h>
! #include <internal.h>
! 
! /*
!  * Number of 100 nanosecond units from 1/1/1601 to 1/1/1970
!  */
  #define EPOCH_BIAS  116444736000000000i64
  
- /*
-  * Union to facilitate converting from FILETIME to unsigned __int64
-  */
  typedef union {
!         unsigned __int64 ft_scalar;
!         FILETIME ft_struct;
!         } FT;
! 
! /*
!  * Cache for the minutes count for with DST status was last assessed
!  */
  static time_t elapsed_minutes_cache = 0;
  
- /*
-  * Three values of dstflag_cache
-  */
  #define DAYLIGHT_TIME   1
  #define STANDARD_TIME   0
  #define UNKNOWN_TIME    -1
  
- /*
-  * Cache for the last determined DST status
-  */
  static int dstflag_cache = UNKNOWN_TIME;
  
! /***
! *void _ftime(timeptr) - return DOS time in a structure
! *
! *Purpose:
! *       returns the current DOS time in a struct timeb structure
! *
! *Entry:
! *       struct timeb *timeptr - structure to fill in with time
! *
! *Exit:
! *       no return value -- fills in structure
! *
! *Exceptions:
! *
! *******************************************************************************/
! 
! _CRTIMP void __cdecl _ftime (
!         struct _timeb *tp
!         )
  {
!         FT nt_time;
!         time_t t;
!         TIME_ZONE_INFORMATION tzinfo;
!         DWORD tzstate;
! 
!         __tzset();
! 
!         tp->timezone = (short)(_timezone / 60);
! 
!         GetSystemTimeAsFileTime( &(nt_time.ft_struct) );
! 
!         /*
!          * Obtain the current DST status. Note the status is cached and only
!          * updated once per minute, if necessary.
!          */
!         if ( (t = (time_t)(nt_time.ft_scalar / 600000000i64))
!              != elapsed_minutes_cache )
!         {
!             if ( (tzstate = GetTimeZoneInformation( &tzinfo )) != 0xFFFFFFFF )
!             {
!                 /*
!                  * Must be very careful in determining whether or not DST is
!                  * really in effect.
!                  */
!                 if ( (tzstate == TIME_ZONE_ID_DAYLIGHT) &&
!                      (tzinfo.DaylightDate.wMonth != 0) &&
!                      (tzinfo.DaylightBias != 0) )
!                     dstflag_cache = DAYLIGHT_TIME;
!                 else
!                     /*
!                      * When in doubt, assume standard time
!                      */
!                     dstflag_cache = STANDARD_TIME;
!             }
!             else
!                 dstflag_cache = UNKNOWN_TIME;
! 
!             elapsed_minutes_cache = t;
!         }
! 
!         tp->dstflag = (short)dstflag_cache;
! 
!         tp->millitm = (unsigned short)((nt_time.ft_scalar / 10000i64) %
!                       1000i64);
  
!         tp->time = (time_t)((nt_time.ft_scalar - EPOCH_BIAS) / 10000000i64);
  }
- 
- 
- 
- #else  /* _WIN32 */
- 
- #if defined (_M_MPPC) || defined (_M_M68K)
- 
- 
- #include <cruntime.h>
- #include <sys/types.h>
- #include <sys/timeb.h>
- #include <time.h>
- #include <stdlib.h>
- #include <internal.h>
- #include <macos\osutils.h>      /* get DataTimeRec type */
- #include <macos\memory.h>
- #include <macos\lowmem.h>
- 
- /***
- *void _ftime(timeptr) - return DOS time in a structure
- *
- *Purpose:
- *       returns the current DOS time in a struct timeb structure
- *
- *Entry:
- *       struct timeb *timeptr - structure to fill in with time
- *
- *Exit:
- *       no return value -- fills in structure
- *
- *Exceptions:
- *
- *******************************************************************************/
- 
- void __cdecl _ftime (
-         struct _timeb *tp
-         )
- {
-         struct tm tb;
-         DateTimeRec dt;
- 
-         _tzset();
-         tp->timezone = (short)(_timezone / 60);
- 
-         GetTime(&dt);
- 
-         /*set milliseconds*/
- 
-         tp->millitm = (unsigned short)( ((LMGetTicks() % 60) * 50) / 3);
- 
-         tb.tm_year = dt.year - 1900;
-         tb.tm_mday = dt.day;
-         tb.tm_mon = dt.month - 1;         //[1-12]=>[0-11]
-         tb.tm_hour = dt.hour;
-         tb.tm_min   = dt.minute;
-         tb.tm_sec   = dt.second;
-         tb.tm_wday = dt.dayOfWeek - 1;    //[1-7]=>[0-6]
-         tb.tm_isdst = -1;
- 
-         /*
-          * Call mktime() to compute time_t value and Daylight Savings Time
-          * flag.
-          */
-         tp->time = mktime(&tb);
- 
-         tp->dstflag = (short)(tb.tm_isdst);
- }
- 
- 
- #endif  /* defined (_M_MPPC) || defined (_M_M68K) */
- 
- #endif  /* _WIN32 */
--- 1,84 ----
! // ftime.c - adapted from Microsoft C Runtime
! //
! // Time-stamp: <01/02/01 21:29:29 keuchel@lightning>
  
! #include "celib.h"
  #include <sys/types.h>
  #include <sys/timeb.h>
  #include <time.h>
! 
  #define EPOCH_BIAS  116444736000000000i64
  
  typedef union {
!   unsigned __int64 ft_scalar;
!   FILETIME ft_struct;
! } FT;
! 
  static time_t elapsed_minutes_cache = 0;
  
  #define DAYLIGHT_TIME   1
  #define STANDARD_TIME   0
  #define UNKNOWN_TIME    -1
  
  static int dstflag_cache = UNKNOWN_TIME;
  
! void 
! ftime (struct _timeb *tp)
  {
!   FT nt_time;
!   time_t t;
!   TIME_ZONE_INFORMATION tzinfo;
!   DWORD tzstate;
! 
!   __tzset();
! 
!   tp->timezone = (short)(_timezone / 60);
! 
!   XCEGetSystemTimeAsFileTime(&(nt_time.ft_struct));
! 
!   if((t = (time_t)(nt_time.ft_scalar / 600000000i64))
!        != elapsed_minutes_cache)
!     {
!       if((tzstate = GetTimeZoneInformation(&tzinfo)) != 0xFFFFFFFF)
! 	{
! 	  if ( (tzstate == TIME_ZONE_ID_DAYLIGHT) &&
! 	       (tzinfo.DaylightDate.wMonth != 0) &&
! 	       (tzinfo.DaylightBias != 0) )
! 	    dstflag_cache = DAYLIGHT_TIME;
! 	  else
! 	    dstflag_cache = STANDARD_TIME;
! 	}
!       else
! 	dstflag_cache = UNKNOWN_TIME;
! 
!       elapsed_minutes_cache = t;
!     }
! 
!   tp->dstflag = (short)dstflag_cache;
! 
! #if 0
!   {
!     SYSTEMTIME st;
! 
!     // millis are always 0?
!     GetSystemTime(&st);
!     tp->millitm = st.wMilliseconds;
!   }
! #endif
! 
! #if 0
!   {
!     // this evals to on WinCE
!     tp->millitm = (unsigned short)((nt_time.ft_scalar / 10000i64) %
! 				   1000i64);
!   }
! #endif
! 
! #if 1
!   {
!     tp->millitm = GetTickCount() % 1000;
!   }
! #endif
  
!   tp->time = (time_t)((nt_time.ft_scalar - EPOCH_BIAS) / 10000000i64);
  }