Ok, didn't noticed that one returned the "." and the other didn't. But yes, merging them or having one use the other might be good.

About the other one, I actually checked the uses, and in several places you already have a FileEntry to work with, but there is a place where you don't. Could be made possible to receive a FileEntry, but anyway, i guess it can be useful to have it.