@@ -102,11 +102,12 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
102102char * offset_endptr ;
103103char * remain ;
104104char * is_dst ;
105+ char * saveptr = NULL ;
105106
106107tzentry -> lineno = lineno ;
107108tzentry -> filename = filename ;
108109
109- abbrev = strtok (line ,WHITESPACE );
110+ abbrev = strtok_r (line ,WHITESPACE , & saveptr );
110111if (!abbrev )
111112{
112113GUC_check_errmsg ("missing time zone abbreviation in time zone file \"%s\", line %d" ,
@@ -115,7 +116,7 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
115116}
116117tzentry -> abbrev = pstrdup (abbrev );
117118
118- offset = strtok (NULL ,WHITESPACE );
119+ offset = strtok_r (NULL ,WHITESPACE , & saveptr );
119120if (!offset )
120121{
121122GUC_check_errmsg ("missing time zone offset in time zone file \"%s\", line %d" ,
@@ -135,11 +136,11 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
135136return false;
136137}
137138
138- is_dst = strtok (NULL ,WHITESPACE );
139+ is_dst = strtok_r (NULL ,WHITESPACE , & saveptr );
139140if (is_dst && pg_strcasecmp (is_dst ,"D" )== 0 )
140141{
141142tzentry -> is_dst = true;
142- remain = strtok (NULL ,WHITESPACE );
143+ remain = strtok_r (NULL ,WHITESPACE , & saveptr );
143144}
144145else
145146{
@@ -158,7 +159,7 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
158159tzentry -> zone = pstrdup (offset );
159160tzentry -> offset = 0 ;
160161tzentry -> is_dst = false;
161- remain = strtok (NULL ,WHITESPACE );
162+ remain = strtok_r (NULL ,WHITESPACE , & saveptr );
162163}
163164
164165if (!remain )/* no more non-whitespace chars */
@@ -284,6 +285,7 @@ ParseTzFile(const char *filename, int depth,
284285tzEntry tzentry ;
285286int lineno = 0 ;
286287bool override = false;
288+ char * saveptr = NULL ;
287289const char * p ;
288290
289291/*
@@ -393,7 +395,7 @@ ParseTzFile(const char *filename, int depth,
393395/* pstrdup so we can use filename in result data structure */
394396char * includeFile = pstrdup (line + strlen ("@INCLUDE" ));
395397
396- includeFile = strtok (includeFile ,WHITESPACE );
398+ includeFile = strtok_r (includeFile ,WHITESPACE , & saveptr );
397399if (!includeFile || !* includeFile )
398400{
399401GUC_check_errmsg ("@INCLUDE without file name in time zone file \"%s\", line %d" ,