diff options
| author | Gerald Carter <jerry@samba.org> | 2003-09-09 04:07:32 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2003-09-09 04:07:32 +0000 |
| commit | 4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8 (patch) | |
| tree | dd0a9f32d9933e1f75d919b5083e007d7453f9c4 /source3/modules/vfs_recycle.c | |
| parent | 3d7cb49747a9a7f5cdec0ee05c6270ec3604202f (diff) | |
| download | samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.tar.gz samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.tar.bz2 samba-4093bf7ff8c8861cf7b941945ede53a8ec5bb6c8.zip | |
sync 3.0 into HEAD for the last time
(This used to be commit c17a7dc9a190156a069da3e861c18fd3f81224ad)
Diffstat (limited to 'source3/modules/vfs_recycle.c')
| -rw-r--r-- | source3/modules/vfs_recycle.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c index e725daedba..b1b2ac0353 100644 --- a/source3/modules/vfs_recycle.c +++ b/source3/modules/vfs_recycle.c @@ -336,7 +336,7 @@ static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, co repository = alloc_sub_conn(conn, recycle_repository(handle)); ALLOC_CHECK(repository, done); /* shouldn't we allow absolute path names here? --metze */ - trim_string(repository, "/", "/"); + trim_char(repository, '/', '/'); if(!repository || *(repository) == '\0') { DEBUG(3, ("recycle: repository path not set, purging %s...\n", file_name)); @@ -455,7 +455,8 @@ static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, co /* rename file we move to recycle bin */ i = 1; while (recycle_file_exist(handle, final_name)) { - snprintf(final_name, PATH_MAX -1, "%s/Copy #%d of %s", temp_name, i++, base); + SAFE_FREE(final_name); + asprintf(&final_name, "%s/Copy #%d of %s", temp_name, i++, base); } DEBUG(10, ("recycle: Moving %s to %s\n", file_name, final_name)); |