{
struct timeval curtime;
silc_gettimeofday(&curtime);
- return (curtime.tv_sec * 1000) + (curtime.tv_usec / 1000);
+ return (curtime.tv_sec * (SilcUInt64)1000) +
+ (curtime.tv_usec / (SilcUInt64)1000);
}
/* Return time since Epoch in microseconds */
{
struct timeval curtime;
silc_gettimeofday(&curtime);
- return (curtime.tv_sec * 1000000) + curtime.tv_usec;
+ return (curtime.tv_sec * (SilcUInt64)1000000) + curtime.tv_usec;
}
/* Returns time as string */
SilcBool silc_time_value(SilcInt64 time_val, SilcTime ret_time)
{
- struct tm *time;
+ struct tm *t;
unsigned int msec = 0;
time_t timeval;
+ SilcInt32 ctz = 0;
if (!ret_time)
return TRUE;
msec = (SilcUInt64)time_val % (SilcUInt64)1000;
timeval = (time_t)((SilcUInt64)time_val / (SilcUInt64)1000);
- time = localtime(&timeval);
- if (!time)
+ t = localtime(&timeval);
+ if (!t)
return FALSE;
memset(ret_time, 0, sizeof(*ret_time));
- if (!silc_time_fill(ret_time, time->tm_year + 1900, time->tm_mon + 1,
- time->tm_mday, time->tm_hour, time->tm_min,
- time->tm_sec, msec))
+ if (!silc_time_fill(ret_time, t->tm_year + 1900, t->tm_mon + 1,
+ t->tm_mday, t->tm_hour, t->tm_min,
+ t->tm_sec, msec))
return FALSE;
- ret_time->dst = time->tm_isdst ? 1 : 0;
+ ret_time->dst = t->tm_isdst ? 1 : 0;
+
#ifdef SILC_WIN32
ret_time->utc_east = _timezone < 0 ? 1 : 0;
ret_time->utc_hour = (ret_time->utc_east ? (-(_timezone)) / 3600 :
ret_time->utc_minute = (ret_time->utc_east ? (-(_timezone)) % 3600 :
_timezone % 3600);
#else
-#if defined(HAVE_TZSET)
+#if defined(HAVE_TIMEZONE)
ret_time->utc_east = timezone < 0 ? 1 : 0;
- ret_time->utc_hour = (ret_time->utc_east ? (-(timezone)) / 3600 :
- timezone / 3600);
- ret_time->utc_minute = (ret_time->utc_east ? (-(timezone)) % 3600 :
- timezone % 3600);
-#endif /* HAVE_TZSET */
+ ctz = timezone;
+ if (ret_time->dst)
+ ctz -= 3600;
+#elif defined(HAVE_TM_GMTOFF)
+ ret_time->utc_east = t->tm_gmtoff > 0 ? 1 : 0;
+ ctz = -t->tm_gmtoff;
+#elif defined(HAVE___TM_GMTOFF)
+ ret_time->utc_east = t->__tm_gmtoff > 0 ? 1 : 0;
+ ctz = -t->__tm_gmtoff;
+#elif defined(HAVE___TM_GMTOFF__)
+ ret_time->utc_east = t->__tm_gmtoff__ > 0 ? 1 : 0;
+ ctz = -t->__tm_gmtoff__;
+#endif /* HAVE_TIMEZONE */
+
+ ret_time->utc_hour = (ret_time->utc_east ? (-(ctz)) / 3600 : ctz / 3600);
+ ret_time->utc_minute = (ret_time->utc_east ? (-(ctz)) % 3600 : ctz % 3600);
#endif /* SILC_WIN32 */
+ if (ret_time->utc_minute)
+ ret_time->utc_minute /= 60;
+
return TRUE;
}
if (timezone_size < 6)
return FALSE;
-
+
if (!silc_time_value(0, &curtime))
return FALSE;
if (!curtime.utc_hour && curtime.utc_minute)
silc_snprintf(timezone, timezone_size, "Z");
else if (curtime.utc_minute)
- silc_snprintf(timezone, timezone_size, "%c%02d:%02d",
+ silc_snprintf(timezone, timezone_size, "%c%02d:%02d",
curtime.utc_east ? '+' : '-', curtime.utc_hour,
curtime.utc_minute);
else
/* Return TRUE if `smaller' is smaller than `bigger'. */
-SilcBool silc_compare_timeval(struct timeval *smaller,
- struct timeval *bigger)
+int silc_compare_timeval(struct timeval *t1, struct timeval *t2)
{
- if ((smaller->tv_sec < bigger->tv_sec) ||
- ((smaller->tv_sec == bigger->tv_sec) &&
- (smaller->tv_usec < bigger->tv_usec)))
- return TRUE;
-
- return FALSE;
+ SilcInt32 s = t1->tv_sec - t2->tv_sec;
+ if (!s)
+ return t1->tv_usec - t2->tv_usec;
+ return s;
}