From: David Lawrence Ramsey Date: Sat, 21 Apr 2007 20:13:06 +0000 (+0000) Subject: further simplify do_writeout() X-Git-Tag: v2.0.5~3 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=67b51a87926650ea793cabc459babd3520d5e85c;p=nano.git further simplify do_writeout() git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4093 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/src/files.c b/src/files.c index adbd8e65..752d94ae 100644 --- a/src/files.c +++ b/src/files.c @@ -1908,12 +1908,11 @@ bool do_writeout(bool exiting) full_filename = get_full_path(openfile->filename); name_exists = (stat((full_answer == NULL) ? answer : full_answer, &st) != -1); - if (openfile->filename[0] == '\0') - do_warning = name_exists; - else - do_warning = (strcmp((full_answer == NULL) ? - answer : full_answer, (full_filename == NULL) ? - openfile->filename : full_filename) != 0); + do_warning = (name_exists || + (openfile->filename[0] != '\0' && + strcmp((full_answer == NULL) ? answer : + full_answer, (full_filename == NULL) ? + openfile->filename : full_filename) != 0)); /* Convert nulls to newlines. answer_len is the * string's real length. */