AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2025-01-19 18:36:55 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use strtok_r insteat of strtok

Browse Source 
strtok is not thread-safe because it uses a static pointer to keep track
of position in the string. Using strtok_r solves the problem.
This commit is contained in:
Lucas De Marchi 2011-12-01 18:59:54 -02:00
parent bf89f76eaa
commit c11e62bfd4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libkmod/libkmod-config.c
View File

@ -116,18 +116,18 @@ int kmod_parse_config_file(struct kmod_ctx *ctx, const char *filename,
return errno;
while ((line = getline_wrapped(fp, &linenum)) != NULL) {
char *cmd;
char *cmd, *saveptr;
if (line[0] == '\0' || line[0] == '#')
goto done_next;
cmd = strtok(line, "\t ");
cmd = strtok_r(line, "\t ", &saveptr);
if (cmd == NULL)
goto done_next;
if (!strcmp(cmd, "alias")) {
char *alias = strtok(NULL, "\t ");
char *modname = strtok(NULL, "\t ");
char *alias = strtok_r(NULL, "\t ", &saveptr);
char *modname = strtok_r(NULL, "\t ", &saveptr);
if (alias == NULL || modname == NULL)
goto syntax_error;
@ -136,7 +136,7 @@ int kmod_parse_config_file(struct kmod_ctx *ctx, const char *filename,
underscores(ctx, alias),
underscores(ctx, modname));
} else if (!strcmp(cmd, "blacklist")) {
char *modname = strtok(NULL, "\t ");
char *modname = strtok_r(NULL, "\t ", &saveptr);
if (modname == NULL)
goto syntax_error;