X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetndelim2.h;h=c1c83758103d7288dac50ad647ce522844eeafe6;hb=38db1b35bf51a7a738f27d2660a9fdd3b46447be;hp=fb0a8c3e890275c437f98238ea2316a4f87454bb;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/getndelim2.h b/lib/getndelim2.h
index fb0a8c3e8..c1c837581 100644
--- a/lib/getndelim2.h
+++ b/lib/getndelim2.h
@@ -1,12 +1,12 @@
 /* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
    with bounded memory allocation.
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 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/>.  */
 
 #ifndef GETNDELIM2_H
 #define GETNDELIM2_H 1
@@ -31,8 +30,8 @@
    the buffer as necessary, but if NMAX is not GETNLINE_NO_LIMIT
    then do not allocate more than NMAX bytes; if the line is longer
    than that, read and discard the extra bytes.  Stop reading after
-   after the first occurrence of DELIM1 or DELIM2, whichever comes
-   first; a delimiter equal to EOF stands for no delimiter.  Read the
+   the first occurrence of DELIM1 or DELIM2, whichever comes first;
+   a delimiter equal to EOF stands for no delimiter.  Read the
    input bytes from STREAM.
    Return the number of bytes read and stored at *LINEPTR + OFFSET (not
    including the NUL terminator), or -1 on error or EOF.  */