diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2015-10-09 11:01:04 +0200 | 
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2015-10-09 11:01:04 +0200 | 
| commit | ad006918a570da32457461a5e59289b611d9a732 (patch) | |
| tree | 18559683296ddeddd0b3d43256ac05424ae8362a | |
| parent | Makefile: fix MAKEFLAGS tests with multiple flags (diff) | |
| download | cgit-ad006918a570da32457461a5e59289b611d9a732.tar.gz cgit-ad006918a570da32457461a5e59289b611d9a732.tar.bz2 cgit-ad006918a570da32457461a5e59289b611d9a732.zip | |
Avoid use of non-reentrant functions
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to '')
| -rw-r--r-- | shared.c | 6 | 
1 files changed, 3 insertions, 3 deletions
| @@ -563,7 +563,7 @@ char *expand_macros(const char *txt)  char *get_mimetype_for_filename(const char *filename)  { -	char *ext, *mimetype, *token, line[1024]; +	char *ext, *mimetype, *token, line[1024], *saveptr;  	FILE *file;  	struct string_list_item *mime; @@ -588,8 +588,8 @@ char *get_mimetype_for_filename(const char *filename)  	while (fgets(line, sizeof(line), file)) {  		if (!line[0] || line[0] == '#')  			continue; -		mimetype = strtok(line, " \t\r\n"); -		while ((token = strtok(NULL, " \t\r\n"))) { +		mimetype = strtok_r(line, " \t\r\n", &saveptr); +		while ((token = strtok_r(NULL, " \t\r\n", &saveptr))) {  			if (!strcasecmp(ext, token)) {  				fclose(file);  				return xstrdup(mimetype); | 
