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.

(cherry picked from commit 36c5cbd4a30f4a5aa512281d951de6eb2d610ab1)

• GnuPG-bug-id: T6867