X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=miscutil.c;h=488a774bb965ef0fd591dfe73ed432977d72d471;hp=eabf7b1ea25f6174ee4e9da345645fa8981ab1d5;hb=80685cac02eeff1aec436a033d3e5e6721942f80;hpb=dbfbb023294ebd16a3844cf506d4b70275f5cf25 diff --git a/miscutil.c b/miscutil.c index eabf7b1e..488a774b 100644 --- a/miscutil.c +++ b/miscutil.c @@ -7,7 +7,7 @@ * to deserve their own file but don't really fit in * any other file. * - * Copyright : Written by and Copyright (C) 2001-2018 the + * Copyright : Written by and Copyright (C) 2001-2020 the * Privoxy team. https://www.privoxy.org/ * * Based on the Internet Junkbuster originally written @@ -61,6 +61,7 @@ #include "project.h" #include "miscutil.h" +#include "jcc.h" #include "errlog.h" /********************************************************************* @@ -854,6 +855,53 @@ int privoxy_millisleep(unsigned milliseconds) } +/********************************************************************* + * + * Function : privoxy_gmtime_r + * + * Description : Behave like gmtime_r() and convert a + * time_t to a struct tm. + * + * Parameters : + * 1 : time_spec: The time to convert + * 2 : result: The struct tm to use as storage + * + * Returns : Pointer to the result or NULL on error. + * + *********************************************************************/ +struct tm *privoxy_gmtime_r(const time_t *time_spec, struct tm *result) +{ + struct tm *timeptr; + +#ifdef HAVE_GMTIME_R + timeptr = gmtime_r(time_spec, result); +#elif defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_lock(&gmtime_mutex); + timeptr = gmtime(time_spec); +#else +#warning Using unlocked gmtime() + timeptr = gmtime(time_spec); +#endif + + if (timeptr == NULL) + { +#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE) + privoxy_mutex_unlock(&gmtime_mutex); +#endif + return NULL; + } + +#if !defined(HAVE_GMTIME_R) + *result = *timeptr; + timeptr = result; +#ifdef MUTEX_LOCKS_AVAILABLE + privoxy_mutex_unlock(&gmtime_mutex); +#endif +#endif + + return timeptr; +} + #if !defined(HAVE_TIMEGM) && defined(HAVE_TZSET) && defined(HAVE_PUTENV) /********************************************************************* *