From a7b8b00fd499a4e3a7763a129c6ef1828ddfb4cf Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Fri, 24 May 2002 09:57:33 +0000 Subject: strtok:ing a copy of the parameter instead git-svn-id: svn://svn.rockbox.org/rockbox/trunk@687 a1c6a512-1295-4272-9138-f99709370657 --- firmware/common/dir.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/firmware/common/dir.c b/firmware/common/dir.c index f7f61719a2..e1f4c064a0 100644 --- a/firmware/common/dir.c +++ b/firmware/common/dir.c @@ -29,7 +29,9 @@ static bool busy=false; DIR* opendir(char* name) { + char namecopy[256]; char* part; + char* end; struct fat_direntry entry; struct fat_dir* dir = &(thedir.fatdir); @@ -48,9 +50,11 @@ DIR* opendir(char* name) return NULL; } - /* fixme: strtok() is not thread safe, and fat_getnext() calls yield() */ - for ( part = strtok(name, "/"); part; - part = strtok(NULL, "/")) { + strncpy(namecopy,name,sizeof(namecopy)); + namecopy[sizeof(namecopy)-1] = 0; + + for ( part = strtok_r(namecopy, "/", &end); part; + part = strtok_r(NULL, "/", &end)) { int partlen = strlen(part); /* scan dir for name */ while (1) { -- cgit v1.2.3