X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/3fd896a441c904c3f3608dba41d5e1db84fad776..e3b5f32e06231210d65b0a53599151551954db7e:/lbuf.c

diff --git a/lbuf.c b/lbuf.c
index 8b93076..ba18678 100644
--- a/lbuf.c
+++ b/lbuf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: lbuf.c,v 1.5 2001/02/03 16:23:33 mdw Exp $
+ * $Id: lbuf.c,v 1.6 2002/01/13 13:32:52 mdw Exp $
  *
  * Block-to-line buffering
  *
@@ -30,6 +30,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: lbuf.c,v $
+ * Revision 1.6  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.5  2001/02/03 16:23:33  mdw
  * Bug fix: handle a disable during a close-induced flush without dumping
  * core.
@@ -92,7 +96,7 @@ void lbuf_flush(lbuf *b, char *p, size_t len)
   int cr;				/* Carriage return state */
 
   if (b->f & LBUF_CLOSE) {
-    b->func(0, b->p);
+    b->func(0, 0, b->p);
     return;
   }
 
@@ -120,39 +124,36 @@ void lbuf_flush(lbuf *b, char *p, size_t len)
 
     /* --- Quickly discard uninteresting characters --- */
 
-    if (*q != '\r' && *q != '\n') {
-      cr = 0;
-      continue;
-    }
-    if (*q == '\r') {
-      cr = 1;
-      continue;
+    switch (b->delim) {
+      case LBUF_CRLF:
+      case LBUF_STRICTCRLF:
+	if (*q != '\r' && *q != '\n') {
+	  cr = 0;
+	  continue;
+	}
+	if (*q == '\r') {
+	  cr = 1;
+	  continue;
+	}
+	if (!cr && b->delim == LBUF_STRICTCRLF)
+	  continue;
+	break;
+      default:
+	if (*q != b->delim)
+	  continue;
     }
 
-    /* --- Two choices here --- *
-     *
-     * I can either be strict about CRLF line ends, or I can be shoddy
-     * and allow bare LFs.  I'll do the latter, although I oughtn't,
-     * because it makes testing interactively and with Unix text files
-     * easier.
-     */
-
-#ifdef STRICT_CRLF
-    if (!cr)
-      continue;
-#endif	
-
-    /* --- I have a positive ID on a linefeed --- *
+    /* --- I have a positive ID on a delimiter --- *
      *
      * If I'm interested in this string, report it to my owner.
      */
 
     if (base) {
+      len = q - base;
       if (cr)
-	q[-1] = 0;			/* Exercise: why is this safe? */
-      else
-	*q = 0;
-      b->func(base, b->p);
+	len--;				/* Exercise: why is this safe? */
+      base[len] = 0;
+      b->func(base, len, b->p);
       if (!(b->f & LBUF_ENABLE)) {
 	base = q + 1;
 	break;
@@ -165,10 +166,10 @@ void lbuf_flush(lbuf *b, char *p, size_t len)
   /* --- Sift through the aftermath --- */
 
   if (base) {
-    size_t len = l - base;
+    len = l - base;
     if (len == b->sz) {
       b->buf[len - 1] = 0;
-      b->func(base, b->p);
+      b->func(base, len - 1, b->p);
     } else if (base != b->buf)
       memmove(b->buf, base, len);
     b->len = len;
@@ -195,7 +196,7 @@ void lbuf_close(lbuf *b)
 {
   if (b->len && b->len != b->sz) {
     b->buf[b->len] = 0;
-    b->func(b->buf, b->p);
+    b->func(b->buf, b->len, b->p);
   }
   if (b->buf) {
     x_free(b->a, b->buf);
@@ -203,7 +204,7 @@ void lbuf_close(lbuf *b)
   }
   b->f |= LBUF_CLOSE;
   if (b->f & LBUF_ENABLE)
-    b->func(0, b->p);
+    b->func(0, 0, b->p);
 }
 
 /* --- @lbuf_free@ --- *
@@ -298,7 +299,7 @@ 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:	---
@@ -309,14 +310,13 @@ void lbuf_setsize(lbuf *b, size_t sz)
  *		for the first time.
  */
 
-void lbuf_init(lbuf *b,
-	       void (*func)(char */*s*/, void */*p*/),
-	       void *p)
+void lbuf_init(lbuf *b, lbuf_func *func, void *p)
 {
   b->func = func;
   b->p = p;
   b->len = 0;
   b->f = LBUF_ENABLE;
+  b->delim = LBUF_CRLF;
   b->buf = 0;
   b->a = arena_global;
   lbuf_setsize(b, 256);