X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=90e4cca869ab86613c6be75e0c1fa90ab11f9164;hb=aeb9a8a8a97f8b876a378ae4fe330f131437b348;hp=6317271c2f976569425ff117b85f87b96446d8a3;hpb=526b71aa90c565b1986f188b920e8c7878c34320;p=gnulib.git

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index 6317271c2..90e4cca86 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -3,10 +3,10 @@
    Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004, 2006, 2007
    Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Richard Stallman. */
 
@@ -47,9 +46,9 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
 }
 
 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Consder lines to be terminated by DELIMITER.
+   Consider lines to be terminated by DELIMITER.
    Keep the delimiter; append DELIMITER if it's the last line of a file
-   that ends in a character other than DELIMITER.  Do not null terminate.
+   that ends in a character other than DELIMITER.  Do not NUL-terminate.
    Therefore the stream can contain NUL bytes, and the length
    (including the delimiter) is returned in linebuffer->length.
    Return NULL when stream is empty.  Return NULL and set errno upon