ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify do_writeout() 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4090 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2007-04-21 18:23:06 +00:00
parent 5f7686f9b4
commit 462720a166
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2007-04-21 David Lawrence Ramsey <pooka109@gmail.com>
* files.c (do_writeout): Simplify.
2007-04-19 David Lawrence Ramsey <pooka109@gmail.com>
* files.c (tail): Remove unneeded if statement.

26
src/files.c
View File

@ -1921,27 +1921,25 @@ bool do_writeout(bool exiting)
free(full_answer);
if (do_warning) {
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;
/* If we're using restricted mode, we aren't allowed
* to overwrite an existing file with the current
* file. We also aren't allowed to change the name
* of the current file if it has one, because that
* would allow reading from or writing to files not
* specified on the command line. */
if (ISSET(RESTRICTED))
continue;
if (name_exists) {
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 (!ISSET(RESTRICTED) &&
openfile->filename[0] != '\0'
} else
#ifndef NANO_TINY
&& (exiting || !openfile->mark_set)
if (exiting || !openfile->mark_set)
#endif
) {
{
i = do_yesno_prompt(FALSE,
_("Save file under DIFFERENT NAME ? "));
if (i == 0 || i == -1)