[Scsh-checkins] CVS: scsh/scsh time1.c,1.5,1.6

[Mike Sperber <sperber@users.sourceforge.net>]

Update of /cvsroot/scsh/scsh/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv18555

Modified Files:
        time1.c 
Log Message:
MF 0.6: 1.4->1.5:
Provide -1 value for tm_isdst in non-tz-secs cases.


Index: time1.c
===================================================================
RCS file: /cvsroot/scsh/scsh/scsh/time1.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** time1.c     2001/02/25 19:51:56     1.5
--- time1.c     2001/07/11 13:16:59     1.6
***************
*** 218,222 ****
      d.tm_sec  = sec;  d.tm_min  = min;        d.tm_hour  = hour;
      d.tm_mday = mday; d.tm_mon  = month;      d.tm_year  = year;
!     d.tm_wday = 0;    d.tm_yday = 0;          d.tm_isdst = summer;
  
      if( FIXNUMP(tz_secs) ) {          /* Offset from GMT in seconds. */
--- 218,222 ----
      d.tm_sec  = sec;  d.tm_min  = min;        d.tm_hour  = hour;
      d.tm_mday = mday; d.tm_mon  = month;      d.tm_year  = year;
!     d.tm_wday = 0;    d.tm_yday = 0;
  
      if( FIXNUMP(tz_secs) ) {          /* Offset from GMT in seconds. */
***************
*** 233,236 ****
--- 233,239 ----
        }
  
+     /* ### Note that we *still* don't implement the manual paragraph
+        with "When calcultating with time-zones, the date's SUMMER?
+        field is used to resolve ambiguities. */
      else if( STRINGP(tz_name) ) {     /* Time zone */
        char *newenv[2];
***************
*** 239,242 ****
--- 242,246 ----
        tzset(); /* NetBSD, SunOS POSIX-noncompliance requires this. */
        errno = 0;
+       d.tm_isdst = -1;
        t = mktime(&d);
        if( t == -1 ) return ENTER_FIXNUM(errno ? errno : -1);
***************
*** 247,250 ****
--- 251,255 ----
        tzset(); /* NetBSD, SunOS POSIX-noncompliance requires this. */
        errno = 0;
+       d.tm_isdst = -1;
        t = mktime(&d);
        if( t == -1) return ENTER_FIXNUM(errno ? errno : -1);