From 706257a47d350dac81ac653d8bdf82984b6d58b8 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Tue, 19 Feb 2013 10:35:54 +0400
Subject: [PATCH] (edit_buffer_write_file): refactoring: return number of
 written bytes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/editor/editbuffer.c | 48 ++++++++++++++++++++++++++++++++++--------------
 src/editor/editbuffer.h |  2 +-
 src/editor/editcmd.c    |  5 +----
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/editor/editbuffer.c b/src/editor/editbuffer.c
index a2708ed02..075b84d64 100644
--- a/src/editor/editbuffer.c
+++ b/src/editor/editbuffer.c
@@ -355,26 +355,41 @@ edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size)
  * @param buf pointer to editor buffer
  * @param fd file descriptor
  *
- * @return TRUE if file was written successfullly, FALSE otherswise
+ * @return number of written bytes
  */
 
-gboolean
+off_t
 edit_buffer_write_file (edit_buffer_t * buf, int fd)
 {
-    gboolean ret = TRUE;
+    off_t ret = 0;
     off_t i;
     off_t data_size, sz;
 
     /* write all fullfilled parts of buffers1 from begin to end */
     data_size = EDIT_BUF_SIZE;
     for (i = 0; i < buf->curs1 >> S_EDIT_BUF_SIZE; i++)
-        if (mc_write (fd, (char *) buf->buffers1[i], data_size) != data_size)
-            return FALSE;
+    {
+        sz = mc_write (fd, (char *) buf->buffers1[i], data_size);
+        if (sz >= 0)
+            ret += sz;
+        else if (i == 0)
+            ret = sz;
+
+        if (sz != data_size)
+            return ret;
+    }
 
     /* write last partially filled part of buffers1 */
     data_size = buf->curs1 & M_EDIT_BUF_SIZE;
-    if (mc_write (fd, (char *) buf->buffers1[i], data_size) != data_size)
-        return FALSE;
+    if (data_size != 0)
+    {
+        sz = mc_write (fd, (char *) buf->buffers1[i], data_size);
+        if (sz >= 0)
+            ret += sz;
+
+        if (sz != data_size)
+            return ret;
+    }
 
     /* write buffers2 from end to begin, if buffers2 contains some data */
     if (buf->curs2 != 0)
@@ -384,19 +399,24 @@ edit_buffer_write_file (edit_buffer_t * buf, int fd)
         /* write last partially filled part of buffers2 */
         i = buf->curs2 >> S_EDIT_BUF_SIZE;
         data_size = (buf->curs2 & M_EDIT_BUF_SIZE) + 1;
-        if (mc_write (fd, (char *) buf->buffers2[i] + EDIT_BUF_SIZE - data_size, data_size) != data_size)
-            ret = FALSE;
-        else
+        sz = mc_write (fd, (char *) buf->buffers2[i] + EDIT_BUF_SIZE - data_size, data_size);
+        if (sz >= 0)
+            ret += sz;
+
+        if (sz == data_size)
         {
             data_size = EDIT_BUF_SIZE;
 
             /* write other fullfilled parts of buffers2 from end to begin */
             while (--i >= 0)
-                if (mc_write (fd, (char *) buf->buffers2[i], data_size) != data_size)
-                {
-                    ret = FALSE;
+            {
+                sz = mc_write (fd, (char *) buf->buffers2[i], data_size);
+                if (sz >= 0)
+                    ret += sz;
+
+                if (sz != data_size)
                     break;
-                }
+            }
         }
 
         buf->curs2++;
diff --git a/src/editor/editbuffer.h b/src/editor/editbuffer.h
index 6d5ab7095..cf4cf0943 100644
--- a/src/editor/editbuffer.h
+++ b/src/editor/editbuffer.h
@@ -59,7 +59,7 @@ int edit_buffer_get_prev_utf (const edit_buffer_t * buf, off_t byte_index, int *
 #endif
 
 off_t edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size);
-gboolean edit_buffer_write_file (edit_buffer_t * buf, int fd);
+off_t edit_buffer_write_file (edit_buffer_t * buf, int fd);
 
 /*** inline functions ****************************************************************************/
 
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index 72779a7d7..6bc47edc9 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -309,10 +309,7 @@ edit_save_file (WEdit * edit, const vfs_path_t * filename_vpath)
     }
     else if (edit->lb == LB_ASIS)
     {                           /* do not change line breaks */
-        filelen = edit->last_byte;
-
-        if (!edit_buffer_write_file (&edit->buffer, fd))
-            filelen = -1;
+        filelen = edit_buffer_write_file (&edit->buffer, fd);
 
         if (filelen != edit->last_byte)
         {
-- 
2.11.4.GIT