cleanup to use strsep for fs/fat/inode.c
Hi,
Quoted 2 lines
This patch changes all use of
strtok()tostrsep().Strtok()isn't SMP/thread safe. strsep is considered safer.
OK, but ...
Review
Quoted 2 lines
(quoted diff) +0
-2- for (this_char = strtok(options,","); this_char; - this_char = strtok(NULL,",")) {
This _does not_ change the value of 'options'.
Quoted 1 line
+ while ((
this_char=strsep(&options,",")) != NULL) {
This _does_ change the value of 'options'. Problem is, it's used later. Same is true for your patch to fs/vfat/namei.c.
René
Quoted 8 lines
Quoted 2 lines
This patch changes all use of
strtok()tostrsep().Strtok()isn't SMP/thread safe. strsep is considered safer.OK, but ...
Review
Quoted 2 lines
(quoted diff) +0
-2- for (this_char = strtok(options,","); this_char; - this_char = strtok(NULL,",")) {
Quoted 6 lines
This
_doesnot_change the value of 'options'.Quoted 1 line
+ while ((
this_char=strsep(&options,",")) != NULL) {This _does_ change the value of 'options'. Problem is, it's used later. Same is true for your patch to
fs/vfat/namei.c.
Ok, sorry seems i overlooked that. Patches, for both files, below should fix it.
Cheers,
--
Alex ([email protected])
fs/vfat/namei.c Sun Feb 10 15:28:26 2002 renamed from fs/vfat/namei.c Mon Jan 28 22:20:44 2002 +4 -1
@@ -97,6 +97,7 @@ static int parse_options(char *options, struct fat_mount_options *opts) { char *this_char,*value,save,*savep; + char *optptr = options; int ret, val; opts->unicode_xlate = opts->posixfs = 0;
@@ -114,7 +115,9 @@ save = 0; savep = NULL; ret = 1; - for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { + while ((this_char = strsep(&optptr,",")) != NULL) { + if (!*this_char) + continue; if ((value = strchr(this_char,'=')) != NULL) { save = *value; savep = value;
fs/fat/inode.c Sun Feb 10 15:51:42 2002 renamed from fs/fat/inode.c Sat Feb 9 21:57:39 2002 +4 -3
@@ -203,7 +203,7 @@ char *cvf_format, char *cvf_options) { char *this_char,*value,save,*savep; - char *p; + char *p, *optptr = options; int ret = 1, len; opts->name_check = 'n';
@@ -223,8 +223,9 @@ goto out; save = 0; savep = NULL; - for (this_char = strtok(options,","); this_char; - this_char = strtok(NULL,",")) { + while ((this_char = strsep(&optptr,",")) != NULL) { + if (!*this_char) + continue; if ((value = strchr(this_char,'=')) != NULL) { save = *value; savep = value;