diff options
| author | Volker Lendecke <vl@samba.org> | 2008-01-23 11:04:10 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-01-23 15:08:04 +0100 |
| commit | 587cf54c61c9f1f7bcae431a82035fd942716c32 (patch) | |
| tree | c11ebe9ab6ed860e7e768b1b7de4db3c8ac609a1 /source3/client/clitar.c | |
| parent | 20512431321388cf293431b942cbbe9263d295c9 (diff) | |
| download | samba-587cf54c61c9f1f7bcae431a82035fd942716c32.tar.gz samba-587cf54c61c9f1f7bcae431a82035fd942716c32.tar.bz2 samba-587cf54c61c9f1f7bcae431a82035fd942716c32.zip | |
strtok -> strtok_r
(This used to be commit fd34ce437057bb34cdc37f4b066e424000d36789)
Diffstat (limited to 'source3/client/clitar.c')
| -rw-r--r-- | source3/client/clitar.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 135815c3cd..816e7b1710 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -513,6 +513,7 @@ static bool ensurepath(const char *fname) char *partpath, *ffname; const char *p=fname; char *basehack; + char *saveptr; DEBUG(5, ( "Ensurepath called with: %s\n", fname)); @@ -528,7 +529,7 @@ static bool ensurepath(const char *fname) *partpath = 0; - /* fname copied to ffname so can strtok */ + /* fname copied to ffname so can strtok_r */ safe_strcpy(ffname, fname, strlen(fname)); @@ -541,7 +542,7 @@ static bool ensurepath(const char *fname) *basehack='\0'; } - p=strtok(ffname, "\\"); + p=strtok_r(ffname, "\\", &saveptr); while (p) { safe_strcat(partpath, p, strlen(fname) + 1); @@ -558,7 +559,7 @@ static bool ensurepath(const char *fname) } safe_strcat(partpath, "\\", strlen(fname) + 1); - p = strtok(NULL,"/\\"); + p = strtok_r(NULL, "/\\", &saveptr); } SAFE_FREE(partpath); |