X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Futils%2Fstrbuf.c;h=7d8bc5527f6138f7a1c8ad6cf6730c6445c3460b;hb=ee48af6c45d912a297e183ebdfd2e723e3a8bf1a;hp=6190e3a8a045a650c26067a0d637003bf321ded9;hpb=3a48bac5a41bff96412b1ac8f15bdc97cb9e28be;p=sysdb.git

diff --git a/src/utils/strbuf.c b/src/utils/strbuf.c
index 6190e3a..7d8bc55 100644
--- a/src/utils/strbuf.c
+++ b/src/utils/strbuf.c
@@ -36,6 +36,14 @@
 
 #include <unistd.h>
 
+/* free memory if most of the buffer is unused */
+#define CHECK_SHRINK(strbuf) \
+	do { \
+		if ((strbuf)->pos < (strbuf)->size / 3) \
+			/* don't free all memory to avoid churn */ \
+			strbuf_resize((strbuf), 2 * (strbuf)->pos); \
+	} while (0)
+
 /*
  * private data structures
  */
@@ -55,14 +63,17 @@ strbuf_resize(sdb_strbuf_t *strbuf, size_t new_size)
 {
 	char *tmp;
 
-	if (new_size <= strbuf->size)
-		return 0;
+	if (new_size <= strbuf->pos)
+		return -1;
 
 	tmp = realloc(strbuf->string, new_size);
 	if (! tmp)
 		return -1;
 
-	strbuf->string = tmp;
+	if (new_size)
+		strbuf->string = tmp;
+	else
+		strbuf->string = NULL;
 	strbuf->size = new_size;
 	return 0;
 } /* strbuf_resize */
@@ -143,8 +154,8 @@ sdb_strbuf_vappend(sdb_strbuf_t *strbuf, const char *fmt, va_list ap)
 	}
 
 	/* 'status' does not include nul-byte */
-	if ((size_t)status >= strbuf->size - strbuf->pos - 1) {
-		if (strbuf_resize(strbuf, strbuf->size + (size_t)status)) {
+	if ((size_t)status >= strbuf->size - strbuf->pos) {
+		if (strbuf_resize(strbuf, strbuf->pos + (size_t)status + 1)) {
 			va_end(aq);
 			return -1;
 		}
@@ -157,6 +168,11 @@ sdb_strbuf_vappend(sdb_strbuf_t *strbuf, const char *fmt, va_list ap)
 		strbuf->pos += (size_t)status;
 
 	va_end(aq);
+
+	/* even though this function always appends to the existing buffer, the
+	 * size might have previously been reset */
+	CHECK_SHRINK(strbuf);
+
 	return (ssize_t)status;
 } /* sdb_strbuf_vappend */
 
@@ -227,6 +243,10 @@ sdb_strbuf_memappend(sdb_strbuf_t *strbuf, const void *data, size_t n)
 	strbuf->pos += n;
 	strbuf->string[strbuf->pos] = '\0';
 
+	/* even though this function always appends to the existing buffer, the
+	 * size might have previously been reset */
+	CHECK_SHRINK(strbuf);
+
 	return (ssize_t)n;
 } /* sdb_strbuf_memappend */
 
@@ -252,8 +272,9 @@ sdb_strbuf_read(sdb_strbuf_t *strbuf, int fd, size_t n)
 	if (! strbuf)
 		return -1;
 
-	if (strbuf_resize(strbuf, strbuf->pos + n + 1))
-		return -1;
+	if (strbuf->pos + n + 1 >= strbuf->size)
+		if (strbuf_resize(strbuf, strbuf->pos + n + 1))
+			return -1;
 
 	ret = read(fd, strbuf->string + strbuf->pos, n);
 	if (ret > 0)
@@ -306,11 +327,25 @@ sdb_strbuf_skip(sdb_strbuf_t *strbuf, size_t offset, size_t n)
 	assert(offset < strbuf->pos);
 
 	start = strbuf->string + offset;
-	memmove(start, start + n, strbuf->pos - n);
+	memmove(start, start + n, len - n);
 	strbuf->pos -= n;
 	strbuf->string[strbuf->pos] = '\0';
+
+	/* don't resize now but wait for the next write to avoid churn */
 } /* sdb_strbuf_skip */
 
+void
+sdb_strbuf_clear(sdb_strbuf_t *strbuf)
+{
+	if ((! strbuf) || (! strbuf->size))
+		return;
+
+	strbuf->string[0] = '\0';
+	strbuf->pos = 0;
+
+	/* don't resize now but wait for the next write to avoid churn */
+} /* sdb_strbuf_clear */
+
 const char *
 sdb_strbuf_string(sdb_strbuf_t *strbuf)
 {
@@ -329,5 +364,13 @@ sdb_strbuf_len(sdb_strbuf_t *strbuf)
 	return strbuf->pos;
 } /* sdb_strbuf_string */
 
+size_t
+sdb_strbuf_cap(sdb_strbuf_t *strbuf)
+{
+	if (! strbuf)
+		return 0;
+	return strbuf->size;
+} /* sdb_strbuf_cap */
+
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */