From: David Lawrence Ramsey Date: Thu, 14 Dec 2006 22:11:44 +0000 (+0000) Subject: more miscellaneous minor fixes X-Git-Tag: v2.0.2~6 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ad64cd97b86f1502e06937e9b7e0ae382bfa579e;p=nano.git more miscellaneous minor fixes git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3999 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/src/files.c b/src/files.c index 35dbb228..eae0ff47 100644 --- a/src/files.c +++ b/src/files.c @@ -1906,33 +1906,31 @@ int do_writeout(bool exiting) if (full_answer != NULL) free(full_answer); - if (different_name) { - if (name_exists) { - /* If we're using restricted mode, we aren't - * allowed to save a new file under the name of - * an existing file. */ - if (ISSET(RESTRICTED)) - continue; - - i = do_yesno_prompt(FALSE, - _("File exists, OVERWRITE ? ")); - if (i == 0 || i == -1) - continue; + if (name_exists) { /* If we're using restricted mode, we aren't allowed - * to change the name of a file once it has one, - * because that would allow reading from or writing - * to files not specified on the command line. */ - } else if (!ISSET(RESTRICTED) && + * to save a new file under the name of an existing + * file. */ + if (ISSET(RESTRICTED)) + continue; + + i = do_yesno_prompt(FALSE, + _("File exists, OVERWRITE ? ")); + if (i == 0 || i == -1) + continue; + /* If we're using restricted mode, we aren't allowed to + * change the name of a file once it has one, because + * that would allow reading from or writing to files not + * specified on the command line. */ + } else if (different_name && !ISSET(RESTRICTED) && openfile->filename[0] != '\0' #ifndef NANO_TINY && (exiting || !openfile->mark_set) #endif ) { - i = do_yesno_prompt(FALSE, - _("Save file under DIFFERENT NAME ? ")); - if (i == 0 || i == -1) - continue; - } + i = do_yesno_prompt(FALSE, + _("Save file under DIFFERENT NAME ? ")); + if (i == 0 || i == -1) + continue; } }