Fix restore -C to handle correctly directories containing a file with the same name...