From ab8698df470dfac89921b693fb9664905155fffd Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 23 Mar 2018 17:12:55 +0100
Subject: [PATCH] tweaks: condense some code, to remove a bit of duplication
---
src/nano.c | 42 ++++++++++++++++--------------------------
1 file changed, 16 insertions(+), 26 deletions(-)
diff --git a/src/nano.c b/src/nano.c
index 95a4ecbb..f08794be 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -586,6 +586,7 @@ void finish(void)
void die(const char *msg, ...)
{
va_list ap;
+ openfilestruct *firstone = openfile;
curs_set(1);
endwin();
@@ -597,38 +598,27 @@ void die(const char *msg, ...)
vfprintf(stderr, msg, ap);
va_end(ap);
+ while (openfile) {
#ifndef NANO_TINY
- /* If the current buffer has a lockfile, remove it. */
- if (openfile && ISSET(LOCKING) && openfile->lock_filename)
- delete_lockfile(openfile->lock_filename);
+ /* If the current buffer has a lockfile, remove it. */
+ if (ISSET(LOCKING) && openfile->lock_filename)
+ delete_lockfile(openfile->lock_filename);
#endif
+ /* If the current file buffer was modified, save it. */
+ if (openfile->modified) {
+ /* If the buffer is partitioned, unpartition it first. */
+ if (filepart != NULL)
+ unpartition_filestruct(&filepart);
- /* If the current file buffer was modified, save it. */
- if (openfile && openfile->modified) {
- /* If the buffer is partitioned, unpartition it first. */
- if (filepart != NULL)
- unpartition_filestruct(&filepart);
-
- die_save_file(openfile->filename, openfile->current_stat);
- }
-
-#ifdef ENABLE_MULTIBUFFER
- /* Save all of the other modified file buffers, if any. */
- if (openfile != NULL) {
- openfilestruct *firstone = openfile;
+ die_save_file(openfile->filename, openfile->current_stat);
+ }
- while (openfile->next != firstone) {
- openfile = openfile->next;
+ filepart = NULL;
+ openfile = openfile->next;
-#ifndef NANO_TINY
- if (ISSET(LOCKING) && openfile->lock_filename)
- delete_lockfile(openfile->lock_filename);
-#endif
- if (openfile->modified)
- die_save_file(openfile->filename, openfile->current_stat);
- }
+ if (openfile == firstone)
+ break;
}
-#endif
/* Abandon the building. */
exit(1);
--
GitLab