From e6ff98d239f1ca5fb81fefc84ef22b2872a32ac5 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Tue, 19 Feb 2013 10:06:33 +0400
Subject: [PATCH] (edit_buffer_read_file): refactoring: return number of read
 bytes.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 src/editor/edit.c       |  2 +-
 src/editor/editbuffer.c | 21 ++++++++++++++-------
 src/editor/editbuffer.h |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/editor/edit.c b/src/editor/edit.c
index 9610013b4..b3cb016c3 100644
--- a/src/editor/edit.c
+++ b/src/editor/edit.c
@@ -162,7 +162,7 @@ edit_load_file_fast (WEdit * edit, const vfs_path_t * filename_vpath)
         return FALSE;
     }
 
-    ret = edit_buffer_read_file (&edit->buffer, file, edit->last_byte);
+    ret = (edit_buffer_read_file (&edit->buffer, file, edit->last_byte) == edit->last_byte);
     if (ret)
         edit->total_lines = edit_count_lines (edit, 0, edit->last_byte);
     else
diff --git a/src/editor/editbuffer.c b/src/editor/editbuffer.c
index 81b1a0595..5df17050c 100644
--- a/src/editor/editbuffer.c
+++ b/src/editor/editbuffer.c
@@ -307,12 +307,13 @@ edit_buffer_get_prev_utf (const edit_buffer_t * buf, off_t byte_index, int *char
  * @param fd file descriptor
  * @param size file size
  *
- * @return TRUE if file was readed successfully, FALSE otherwise
+ * @return number of read bytes
  */
 
-gboolean
+off_t
 edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size)
 {
+    off_t ret;
     off_t i;
     off_t data_size;
 
@@ -324,21 +325,27 @@ edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size)
 
     /* fill last part of buffers2 */
     data_size = buf->curs2 & M_EDIT_BUF_SIZE;
-    if (mc_read (fd, (char *) buf->buffers2[i] + EDIT_BUF_SIZE - data_size, data_size) < 0)
-        return FALSE;
+    ret = mc_read (fd, (char *) buf->buffers2[i] + EDIT_BUF_SIZE - data_size, data_size);
+    if (ret < 0 || ret != data_size)
+        return ret;
 
     /* fullfill other parts of buffers2 from end to begin */
     data_size = EDIT_BUF_SIZE;
     for (--i; i >= 0; i--)
     {
+        off_t sz;
+
         /* edit->buffers2[0] is already allocated */
         if (buf->buffers2[i] == NULL)
             buf->buffers2[i] = g_malloc0 (data_size);
-        if (mc_read (fd, (char *) buf->buffers2[i], data_size) < 0)
-            return FALSE;
+        sz = mc_read (fd, (char *) buf->buffers2[i], data_size);
+        if (sz >= 0)
+            ret += sz;
+        if (sz != data_size)
+            break;
     }
 
-    return TRUE;
+    return ret;
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/src/editor/editbuffer.h b/src/editor/editbuffer.h
index d5e461d4e..c9b5b2b5b 100644
--- a/src/editor/editbuffer.h
+++ b/src/editor/editbuffer.h
@@ -58,7 +58,7 @@ int edit_buffer_get_utf (const edit_buffer_t * buf, off_t byte_index, int *char_
 int edit_buffer_get_prev_utf (const edit_buffer_t * buf, off_t byte_index, int *char_width);
 #endif
 
-gboolean edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size);
+off_t edit_buffer_read_file (edit_buffer_t * buf, int fd, off_t size);
 
 /*** inline functions ****************************************************************************/