- files.c:read_file() - Abort if we read a file of 0 lines (num_lines == 0), fixes...

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_1_0_branch/nano@1135 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/BUGS b/BUGS
index 26ac5c085e5c3da4d9cac1676b2e69490289f174..cc188c68453d04fd4acb93c6221be3ef96f7b5eb 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -134,7 +134,7 @@
   Trevor Cordes) (68) [FIXED].
 - Home and End control keys (^A, ^E) do not always work in filename
   prompt (bug found by Ian Turner) (69) [FIXED].
-
+- Trying to insert a file of 0 bytes will hang nano (70) [FIXED].
 ** Open BUGS **
 
 $Id$

diff --git a/ChangeLog b/ChangeLog
index 10f05b0403f9e8d88132279e9b9601ac7368ef47..5861eca3553c25455ea613540edcc254fc060b4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,19 @@
 CVS code -
+- files.c:
+  read_file()
+       - Abort if we read a file of 0 lines (num_lines == 0), fixes BUG #70.
 - winio.c:
   nanogetstr()
        - Add NANO_HOME_KEY and NANO_END_KEY to the home and
          end key code (fixes BUG #69).
   bottombars(), onekey()
        - Make bottom list dynamic with screen size (Guus Sliepen & Chris).
+  do_credits()
+       - Add Thomas Dickey.
 - utils.c:
   strcasestr()
        - Renamed to stristr since strcasestr has not been confirmed to
          be detected properly on various Linux systems.
-- winio.c:
-  do_credits()
-       - Add Thomas Dickey.
 - THANKS:
        - Added missing entry for Eivind Kjørstad.
 - po/no.po:

diff --git a/files.c b/files.c
index 7c3b437da1ebe7e42e43f119342bdfa241e95547..7b156f549f7628666b943bb288d67ba22899385c 100644 (file)
--- a/files.c
+++ b/files.c
@@ -180,7 +180,15 @@ int read_file(int fd, char *filename)
        num_lines++;
        buf[0] = 0;
     }
-    /* Did we even GET a file? */
+
+   /* Did we try to insert a file of 0 bytes? */
+    if (num_lines == 0)
+    {
+        statusbar(_("Read %d lines"), 0);
+        return 1;
+    }
+
+    /* Did we even GET a file if we don't already have one? */
     if (totsize == 0 || fileptr == NULL) {
        new_file();
        statusbar(_("Read %d lines"), num_lines);