d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use strsep() instead of strtok().

Browse Source 
- strdup() uses M_WAITOK, so we don't need to check it's return value
  against NULL.

MFC after:	2 weeks
This commit is contained in:
Pawel Jakub Dawidek 2005-10-06 19:04:08 +00:00
parent 46ceae8bc4
commit df71afde00
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/nfsclient/nfs_diskless.c
View File

@ -63,15 +63,14 @@ static int decode_nfshandle(char *ev, u_char *fh);
static void
nfs_parse_options(const char *envopts, struct nfs_diskless *nd)
{
char *opts, *o;
char *opts, *o, *otmp;
opts = strdup(envopts, M_TEMP);
if (opts == NULL) {
printf("nfs_diskless: cannot allocate memory for options\n");
return;
}
for (o = strtok(opts, ":;, "); o != NULL; o = strtok(NULL, ":;, ")) {
if (strcmp(o, "soft") == 0)
otmp = opts;
while ((o = strsep(&otmp, ":;, ")) != NULL) {
if (*o == '\0')
; /* Skip empty options. */
else if (strcmp(o, "soft") == 0)
nd->root_args.flags |= NFSMNT_SOFT;
else if (strcmp(o, "intr") == 0)
nd->root_args.flags |= NFSMNT_INT;