From b8f6e131ca4f9ab50f17d6a133b79b536804e77c Mon Sep 17 00:00:00 2001 From: Kevin McCarthy Date: Sun, 14 Jul 2013 19:48:44 -0700 Subject: [PATCH] Allow filename prompt when saving multiple attachments to a directory. (closes #3083) Currently, if you specify a directory when saving multiple attachments and choose (a)ll, the first attachment is saved without confirming the filename. Subsequent attachments prompt for the filename. --- muttlib.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/muttlib.c b/muttlib.c index 78c34de9..8005e9c3 100644 --- a/muttlib.c +++ b/muttlib.c @@ -992,16 +992,11 @@ int mutt_check_overwrite (const char *attname, const char *path, else if ((rc = mutt_yesorno (_("File is a directory, save under it?"), M_YES)) != M_YES) return (rc == M_NO) ? 1 : -1; - if (!attname || !attname[0]) - { - tmp[0] = 0; - if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp), - M_FILE | M_CLEAR) != 0 || !tmp[0]) - return (-1); - mutt_concat_path (fname, path, tmp, flen); - } - else - mutt_concat_path (fname, path, mutt_basename (attname), flen); + strfcpy (tmp, mutt_basename (NONULL (attname)), sizeof (tmp)); + if (mutt_get_field (_("File under directory: "), tmp, sizeof (tmp), + M_FILE | M_CLEAR) != 0 || !tmp[0]) + return (-1); + mutt_concat_path (fname, path, tmp, flen); } if (*append == 0 && access (fname, F_OK) == 0) -- 2.50.1