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

diff --git a/lbuf.c b/lbuf.c
index 8b93076..b9571a4 100644
--- a/lbuf.c
+++ b/lbuf.c
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: lbuf.c,v 1.5 2001/02/03 16:23:33 mdw Exp $
+ * $Id: lbuf.c,v 1.7 2004/04/08 01:36:13 mdw Exp $
  *
  * Block-to-line buffering
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the mLib utilities library.
  *
@@ -15,39 +15,18 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * mLib is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with mLib; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: lbuf.c,v $
- * Revision 1.5  2001/02/03 16:23:33  mdw
- * Bug fix: handle a disable during a close-induced flush without dumping
- * core.
- *
- * Revision 1.4  2000/06/17 10:38:14  mdw
- * Add support for variable buffer sizes.
- *
- * Revision 1.3  1999/05/22 13:38:50  mdw
- * Fix bug which discarded initial portions of incomplete lines.
- *
- * Revision 1.2  1999/05/17 20:36:08  mdw
- * Make the magical constants for the buffer flags uppercase.
- *
- * Revision 1.1  1999/05/14 21:01:14  mdw
- * Integrated `select' handling bits from the background resolver project.
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <assert.h>
@@ -92,7 +71,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 +99,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 +141,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 +171,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 +179,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 +274,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 +285,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);