Skip to content

Fixed FTP and SMB to use rmdir() when deleting folders#6123

Merged
PVince81 merged 1 commit into
masterfrom
extstorage-deletedirs2
Nov 29, 2013
Merged

Fixed FTP and SMB to use rmdir() when deleting folders#6123
PVince81 merged 1 commit into
masterfrom
extstorage-deletedirs2

Conversation

@PVince81

Copy link
Copy Markdown
Contributor

Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.

Please review @schiesbn @karlitschek @icewind1991 @DeepDiver1975

@icewind1991 the issues you mentioned previously related to making multiple calls to is_dir() won't cause performance issues as they are read from the stat cache (I've checked the smbclient calls)

Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
@karlitschek

Copy link
Copy Markdown
Contributor

👍

@PVince81

Copy link
Copy Markdown
Contributor Author

@owncloud-bot please retest this

@MorrisJobke

Copy link
Copy Markdown
Contributor

@owncloud-bot retest this please

@ghost

ghost commented Nov 29, 2013

Copy link
Copy Markdown

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/2215/

@schiessle

Copy link
Copy Markdown
Contributor

didn't test it but makes sense 👍

@PVince81

Copy link
Copy Markdown
Contributor Author

@icewind1991 are you ok with this approach ?

@icewind1991

Copy link
Copy Markdown
Contributor

👍

PVince81 pushed a commit that referenced this pull request Nov 29, 2013
Fixed FTP and SMB to use rmdir() when deleting folders
@PVince81
PVince81 merged commit baa587f into master Nov 29, 2013
@PVince81
PVince81 deleted the extstorage-deletedirs2 branch November 29, 2013 19:23
@lock lock Bot locked as resolved and limited conversation to collaborators Aug 21, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

FTP mount can't delete folders External API for sharing (upload and download)

5 participants