diff options
| author | Simo Sorce <idra@samba.org> | 2008-02-01 14:24:31 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-02-01 14:24:31 -0500 |
| commit | 2fffc9a1b1fe2a1490e867bb38462e50c282d2b3 (patch) | |
| tree | 428e09c9b35138db8b7ca7161c659a71aa129d29 /source3/modules/vfs_recycle.c | |
| parent | 93a3c5b3f9927973b4ad1496f593ea147052d1e1 (diff) | |
| parent | b708005a7106db26d7df689b887b419c9f2ea41c (diff) | |
| download | samba-2fffc9a1b1fe2a1490e867bb38462e50c282d2b3.tar.gz samba-2fffc9a1b1fe2a1490e867bb38462e50c282d2b3.tar.bz2 samba-2fffc9a1b1fe2a1490e867bb38462e50c282d2b3.zip | |
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
(This used to be commit 7dbfc7bdc65314466a83e8121b35c9bcb24b2631)
Diffstat (limited to 'source3/modules/vfs_recycle.c')
| -rw-r--r-- | source3/modules/vfs_recycle.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index fef65efa77..da1716719a 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -269,6 +269,7 @@ static bool recycle_create_dir(vfs_handle_struct *handle, const char *dname) char *token; char *tok_str; bool ret = False; + char *saveptr; mode = recycle_directory_mode(handle); @@ -286,7 +287,8 @@ static bool recycle_create_dir(vfs_handle_struct *handle, const char *dname) } /* Create directory tree if neccessary */ - for(token = strtok(tok_str, "/"); token; token = strtok(NULL, "/")) { + for(token = strtok_r(tok_str, "/", &saveptr); token; + token = strtok_r(NULL, "/", &saveptr)) { safe_strcat(new_dir, token, len); if (recycle_directory_exist(handle, new_dir)) DEBUG(10, ("recycle: dir %s already exists\n", new_dir)); |