Commit 0d5bfe88 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Andreas Damm made getdate use gmtime_r if available

parent cc2f1d48

lib/getdate.c

+8 −1
Original line number Diff line number Diff line
@@ -2102,7 +2102,14 @@ curl_getdate (const char *p, const time_t *now) 
  if (cookie.yyHaveZone)

    {

      long delta;

      struct tm *gmt = gmtime (&Start);

      struct tm *gmt;

#ifdef HAVE_GMTIME_R

      /* thread-safe version */

      struct tm keeptime;

      gmt = (struct tm *)gmtime_r(&Start, &keeptime);

#else

      gmt = gmtime(&Start);

#endif

      if (!gmt)

	return -1;

      delta = cookie.yyTimezone * 60L + difftm (&tm, gmt);

lib/getdate.y

+9 −2
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ typedef struct _CONTEXT { 
%expect 13



/* turn global variables into locals, additionally enable extra arguments

** for yylex (pointer to yylval and use defined value)

** for yylex (pointer to yylval and user defined value)

*/

%pure_parser
@@ -1058,7 +1058,14 @@ curl_getdate (const char *p, const time_t *now) 
  if (cookie.yyHaveZone)

    {

      long delta;

      struct tm *gmt = gmtime (&Start);

      struct tm *gmt;

#ifdef HAVE_GMTIME_R

      /* thread-safe version */

      struct tm keeptime;

      gmt = (struct tm *)gmtime_r(&Start, &keeptime);

#else

      gmt = gmtime(&Start);

#endif

      if (!gmt)

	return -1;

      delta = cookie.yyTimezone * 60L + difftm (&tm, gmt);