@@ -97,6 +97,7 @@ validateTzEntry(tzEntry *tzentry)
9797static bool
9898splitTzLine (const char * filename ,int lineno ,char * line ,tzEntry * tzentry )
9999{
100+ char * brkl ;
100101char * abbrev ;
101102char * offset ;
102103char * offset_endptr ;
@@ -106,7 +107,7 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
106107tzentry -> lineno = lineno ;
107108tzentry -> filename = filename ;
108109
109- abbrev = strtok (line ,WHITESPACE );
110+ abbrev = strtok_r (line ,WHITESPACE , & brkl );
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 , & brkl );
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 , & brkl );
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 , & brkl );
143144}
144145else
145146{
@@ -158,7 +159,7 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
158159tzentry -> zone = pstrdup (offset );
159160tzentry -> offset = 0 * SECS_PER_HOUR ;
160161tzentry -> is_dst = false;
161- remain = strtok (NULL ,WHITESPACE );
162+ remain = strtok_r (NULL ,WHITESPACE , & brkl );
162163}
163164
164165if (!remain )/* no more non-whitespace chars */
@@ -394,8 +395,9 @@ ParseTzFile(const char *filename, int depth,
394395{
395396/* pstrdup so we can use filename in result data structure */
396397char * includeFile = pstrdup (line + strlen ("@INCLUDE" ));
398+ char * brki ;
397399
398- includeFile = strtok (includeFile ,WHITESPACE );
400+ includeFile = strtok_r (includeFile ,WHITESPACE , & brki );
399401if (!includeFile || !* includeFile )
400402{
401403GUC_check_errmsg ("@INCLUDE without file name in time zone file \"%s\", line %d" ,