in parse_rcfile(), properly handle rcfiles that don't end in newlines

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

diff --git a/ChangeLog b/ChangeLog
index 091455b8bc4c23ecefab24548a52c9ee4565683c..b2af78fa6e1de8e9c3e4bf9fc08e95a28f9af356 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -262,6 +262,7 @@ CVS code -
          any associated color commands. (DLR)
        - Change variable i from an int to a size_t, for consistency.
          (DLR)
+       - Properly handle rcfiles that don't end in newlines. (DLR)
   do_rcfile()
        - Check for the rcfile's being a directory or device file and
          reject it if it is, for consistency with file handling

diff --git a/src/rcfile.c b/src/rcfile.c
index 5996b33465bb4523eb34eaf596fe503d24e450d6..bebf2b99468de153575fa697f5f0ef7078499e56 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -622,7 +622,8 @@ void parse_rcfile(FILE *rcstream
        size_t i;
 
        /* Ignore the newline. */
-       buf[len - 1] = '\0';
+       if (buf[len - 1] == '\n')
+           buf[len - 1] = '\0';
 
        lineno++;
        ptr = buf;