pike.git / src / builtin_functions.c

version» Context lines:

pike.git/src/builtin_functions.c:1:   /*   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: builtin_functions.c,v 1.551 2004/12/16 17:08:36 mast Exp $ + || $Id: builtin_functions.c,v 1.552 2004/12/22 12:48:56 grubba Exp $   */      #include "global.h" - RCSID("$Id: builtin_functions.c,v 1.551 2004/12/16 17:08:36 mast Exp $"); + RCSID("$Id: builtin_functions.c,v 1.552 2004/12/22 12:48:56 grubba Exp $");   #include "interpret.h"   #include "svalue.h"   #include "pike_macros.h"   #include "object.h"   #include "program.h"   #include "array.h"   #include "pike_error.h"   #include "constants.h"   #include "mapping.h"   #include "stralloc.h"
pike.git/src/builtin_functions.c:4341:    f_aggregate_mapping(20);   }   #endif      #if defined (HAVE_GMTIME) || defined (HAVE_LOCALTIME)   /* Returns the approximate difference in seconds between the    * two struct tm's.    */   static time_t my_tm_diff(const struct tm *t1, const struct tm *t2)   { -  time_t base = (t1->tm_year - t2->tm_year) * 32140800; +  time_t base;    -  +  /* Win32 localtime() returns NULL for all dates before Jan 01, 1970. */ +  if (!t2) return -1; +  +  base = (t1->tm_year - t2->tm_year) * 32140800; +     /* Overflow detection. (Should possibly be done on the other fields    * too to cope with very large invalid dates.) */    if ((t1->tm_year > t2->tm_year) && (base < 0))    return MAX_TIME_T;    if ((t1->tm_year < t2->tm_year) && (base > 0))    return MIN_TIME_T;       base +=    (t1->tm_mon - t2->tm_mon) * 2678400 +    (t1->tm_mday - t2->tm_mday) * 86400 +
pike.git/src/builtin_functions.c:4385: Inside #if defined (HAVE_GMTIME) || defined (HAVE_LOCALTIME)
   for (loop_cnt = 0; loop_cnt < 20; loop_cnt++, old_diff_ts = diff_ts) {    diff_ts = my_tm_diff(target_tm, current_tm = timefn(&current_ts));      #ifdef DEBUG_MY_TIME_INVERSE    fprintf (stderr, "curr: y %d m %d d %d h %d m %d isdst %d\n",    current_tm->tm_year, current_tm->tm_mon, current_tm->tm_mday,    current_tm->tm_hour, current_tm->tm_min, current_tm->tm_isdst);    fprintf (stderr, "diff: %d\n", diff_ts);   #endif    +  if (!current_tm) { + #ifdef DEBUG_MY_TIME_INVERSE +  fprintf (stderr, "outside range for timefn().\n"); + #endif +  return 0; +  } +     if (!diff_ts) {    /* Got a satisfactory time, but if target_tm has an opinion on    * DST we should check if we can return an alternative in the    * same DST zone, to cope with the overlapping DST adjustment at    * fall. */    if (target_tm->tm_isdst >= 0 &&    target_tm->tm_isdst != current_tm->tm_isdst &&    !tried_dst_displacement) {    /* Offset the time a day and iterate some more (only once    * more, really), so that we approach the target time from the