X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/393cf1d9803c3dfda0fbb8add9bc5cb9b1f6f07b..4f6d400bf0d6324faa343ea121f465017032d72b:/lbuf.h

diff --git a/lbuf.h b/lbuf.h
index 9f290b8..df8fdff 100644
--- a/lbuf.h
+++ b/lbuf.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: lbuf.h,v 1.5 2001/01/20 12:06:01 mdw Exp $
+ * $Id: lbuf.h,v 1.7 2002/01/13 13:32:52 mdw Exp $
  *
  * Block-to-line buffering
  *
@@ -30,6 +30,14 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: lbuf.h,v $
+ * Revision 1.7  2002/01/13 13:32:52  mdw
+ * Pass line length to line handler function.  Provide a @typedef@ for
+ * handler functions.  Allow run-time configuration of line delimiters.
+ *
+ * Revision 1.6  2001/02/03 16:23:33  mdw
+ * Bug fix: handle a disable during a close-induced flush without dumping
+ * core.
+ *
  * Revision 1.5  2001/01/20 12:06:01  mdw
  * Define flags with macros, to ensure unsignedness.
  *
@@ -112,11 +120,16 @@
  * that.
  */
 
+struct lbuf;
+
+typedef void lbuf_func(char */*s*/, size_t /*len*/, void */*p*/);
+
 typedef struct lbuf {
-  void (*func)(char */*s*/, void */*p*/); /* Handler function */
+  lbuf_func *func;			/* Handler function */
   void *p;				/* Argument for handler */
   size_t len;				/* Length of data in buffer */
   size_t sz;				/* Buffer size */
+  unsigned delim;			/* Delimiter to look for */
   unsigned f;				/* Various useful state flags */
   arena *a;				/* Memory allocation arena */
   char *buf;				/* The actual buffer */
@@ -124,6 +137,12 @@ typedef struct lbuf {
 
 #define LBUF_CR 1u			/* Read a carriage return */
 #define LBUF_ENABLE 2u			/* Buffer is currently enabled */
+#define LBUF_CLOSE 4u			/* Buffer is now closed */
+
+enum {
+  LBUF_CRLF = 256,
+  LBUF_STRICTCRLF = 257
+};
 
 /*----- Functions provided ------------------------------------------------*/
 
@@ -211,7 +230,7 @@ extern void lbuf_setsize(lbuf */*b*/, size_t /*sz*/);
 /* --- @lbuf_init@ --- *
  *
  * Arguments:	@lbuf *b@ = pointer to buffer block
- *		@void (*func)(char *s, void *p)@ = handler function
+ *		@lbuf_func *func@ = handler function
  *		@void *p@ = argument pointer for @func@
  *
  * Returns:	---
@@ -220,9 +239,7 @@ extern void lbuf_setsize(lbuf */*b*/, size_t /*sz*/);
  *		passed to @func@ for processing.
  */
 
-extern void lbuf_init(lbuf */*b*/,
-		      void (*/*func*/)(char */*s*/, void */*p*/),
-		      void */*p*/);
+extern void lbuf_init(lbuf */*b*/, lbuf_func */*func*/, void */*p*/);
 
 /* --- @lbuf_destroy@ --- *
  *