X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flinebuffer.h;h=db41103045843e77c9ce9e781d44010132e05b28;hb=159eae9ff30acac95b6d397f053df8cd6fca62a3;hp=17d2829e0564b0a9d7d6e9cdfecd05850300b0b8;hpb=6d4996af75214fd6fe601f21a7c7ad041b9b7e99;p=gnulib.git
diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 17d2829e0..db4110304 100644
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -1,10 +1,12 @@
/* linebuffer.h -- declarations for reading arbitrarily long lines
- Copyright (C) 1986, 1991 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1986, 1991, 1998, 1999, 2002, 2003, 2007 Free Software
+ Foundation, Inc.
+
+ 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
@@ -12,33 +14,40 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
+ along with this program. If not, see . */
+
+#if !defined LINEBUFFER_H
+# define LINEBUFFER_H
+
+# include
+
/* A `struct linebuffer' holds a line of text. */
struct linebuffer
{
- long size; /* Allocated. */
- long length; /* Used. */
+ size_t size; /* Allocated. */
+ size_t length; /* Used. */
char *buffer;
};
-#undef PARAMS
-#if defined (__STDC__) && __STDC__
-# define PARAMS(Args) Args
-#else
-# define PARAMS(Args) ()
-#endif
-
/* Initialize linebuffer LINEBUFFER for use. */
-void initbuffer PARAMS ((struct linebuffer *linebuffer));
+void initbuffer (struct linebuffer *linebuffer);
+
+/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
+ Consider lines to be terminated by DELIMITER.
+ Keep the delimiter; append DELIMITER if we reach EOF and it wasn't
+ the last character in the file. Do not NUL-terminate.
+ Return LINEBUFFER, except at end of file return NULL. */
+struct linebuffer *readlinebuffer_delim (struct linebuffer *linebuffer,
+ FILE *stream, char delimiter);
/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
- Remove any newline. Does not null terminate.
- Return LINEBUFFER, except at end of file return 0. */
-struct linebuffer *readline PARAMS ((struct linebuffer *linebuffer,
- FILE *stream));
+ Keep the newline; append a newline if it's the last line of a file
+ that ends in a non-newline character. Do not NUL-terminate.
+ Return LINEBUFFER, except at end of file return NULL. */
+struct linebuffer *readlinebuffer (struct linebuffer *linebuffer, FILE *stream);
/* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
-void freebuffer PARAMS ((struct linebuffer *));
+void freebuffer (struct linebuffer *);
+
+#endif /* LINEBUFFER_H */