Return choice and file name when asking for overwrite/rename/etc.
Explicitly returning the user's choice make guessing the choice based
on the returned file name unnecessary. And it prepares for allowing
additional choices like Append.
- GnuPG-bug-id: T6867