From 95491579329778a89f78674fe3fe0bfee0a5b4fa Mon Sep 17 00:00:00 2001
Message-Id: <95491579329778a89f78674fe3fe0bfee0a5b4fa.1715240080.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sat, 5 May 2012 13:00:26 +0100
Subject: [PATCH] buf.c: Step over terminating null byte.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

---
 buf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buf.c b/buf.c
index 9594349..8893adc 100644
--- a/buf.c
+++ b/buf.c
@@ -215,7 +215,8 @@ DOUINTCONV(BUF_PUTU_)
  *
  * Returns:	Zero if OK, nonzero if there wasn't a null byte to be found.
  *
- * Use:		Finds a terminating null byte.
+ * Use:		Finds a terminating null byte.  The length includes this
+ *		terminator.
  */
 
 static int findz(buf *b, size_t *nn)
@@ -226,7 +227,7 @@ static int findz(buf *b, size_t *nn)
     buf_break(b);
     return (-1);
   }
-  *nn = p - BCUR(b);
+  *nn = p - BCUR(b) + 1;
   return (0);
 }
 
-- 
[mdw]