Rockbox

Reproduced in a simulator, in fact no dirs that already exist in the destination will be
removed from the source, for example i tested with these two test dirs:

test1:
dir1
dir2
file

test2:
dir1
dir2
file

if i cut and paste test1 into test2's parent i get asked if i want to overwrite and if
i answer "yes" i end up with a test1 dir that looks as follows:

test1:
dir1
dir2

edit: meh, the whitespace is apparently mangled in comments so dr2 is a subdir of dir1.

I'm guessing this is because the directory moving code just calls rename on the old directory and that fails. Though if that was the case then I'd expect that error to propagate up and show "Paste failed" or something. Either way, the paste code will probably need to explicitly remove the directory after it's done recursing through it or something like that.

Hrm, actually, on closer inspection I think something like this might be needed:

At line 856 of apps/onplay.c add

if (!copy) {
remove_dir(src, srclen);
}

and see if that fixes it. I'd test myself but I don't have a build environment at the moment.

That fixes half the problem, the subdir is now removed but the dir that i select for copying, dir1 in the example above, is still not.

Then try adding this after line 916:

if (success && !clipboard_is_copy) {
remove_dir(clipboard_selection, strlen(clipboard_selection));
}

that should remove the clipboard selection on completion only if it worked.

Yes, that seems to be the right thing, but even with the moderate dir depth
I use for testing i bump in to the max open dirs limit :(
So, let's mark this as depending on FS#9260.