aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/sbuf.c37
-rw-r--r--tests/test_server.c25
2 files changed, 49 insertions, 13 deletions
diff --git a/src/sbuf.c b/src/sbuf.c
index 1f929b9..f286d8c 100644
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -32,7 +32,12 @@ void sbuf_append(sbuf *b, const void *p, size_t n) {
b->ptr[b->len] = '\0';
}
-void sbuf_putc(sbuf *b, char c) { sbuf_append(b, &c, 1); }
+void sbuf_putc(sbuf *b, char c) {
+ sbuf_reserve(b, 1);
+ b->ptr[b->len++] = c;
+ b->ptr[b->len] = '\0';
+}
+
void sbuf_puts(sbuf *b, const char *s) { sbuf_append(b, s, strlen(s)); }
void sbuf_clear(sbuf *b) {
@@ -42,19 +47,25 @@ void sbuf_clear(sbuf *b) {
}
void sbuf_printf(sbuf *b, const char *fmt, ...) {
- va_list ap, ap2;
+ va_list ap;
va_start(ap, fmt);
- va_copy(ap2, ap);
- int n = vsnprintf(NULL, 0, fmt, ap);
- va_end(ap);
- if (n < 0)
- die_oom();
- sbuf_reserve(b, (size_t)n);
- int n2 = vsnprintf(b->ptr + b->len, b->cap - b->len, fmt, ap2);
- va_end(ap2);
- if (n2 < 0 || n2 != n)
- die_oom();
- b->len += (size_t)n;
+ for (;;) {
+ size_t avail = b->cap > b->len ? b->cap - b->len : 0;
+ va_list aq;
+ va_copy(aq, ap);
+ int n = vsnprintf(avail ? b->ptr + b->len : NULL, avail, fmt, aq);
+ va_end(aq);
+ if (n < 0) {
+ va_end(ap);
+ die_oom();
+ }
+ if ((size_t)n < avail) {
+ b->len += (size_t)n;
+ va_end(ap);
+ return;
+ }
+ sbuf_reserve(b, (size_t)n);
+ }
}
void sbuf_free(sbuf *b) {
diff --git a/tests/test_server.c b/tests/test_server.c
index ca3927f..9c51940 100644
--- a/tests/test_server.c
+++ b/tests/test_server.c
@@ -45,6 +45,30 @@ static void test_base64_rfc4648(void) {
}
}
+static void test_sbuf_growth_and_formatting(void) {
+ sbuf b = {0};
+ sbuf_puts(&b, "ab");
+ sbuf_putc(&b, 'c');
+ TEST_ASSERT(b.len == 3);
+ TEST_ASSERT(strcmp(b.ptr, "abc") == 0);
+
+ size_t old_cap = b.cap;
+ sbuf_printf(&b, "-%04d-%s", 7, "tail");
+ TEST_ASSERT(strcmp(b.ptr, "abc-0007-tail") == 0);
+ TEST_ASSERT(b.cap == old_cap);
+
+ char big[600];
+ memset(big, 'x', sizeof(big) - 1);
+ big[sizeof(big) - 1] = '\0';
+ sbuf_puts(&b, big);
+ TEST_ASSERT(b.len == strlen("abc-0007-tail") + sizeof(big) - 1);
+ TEST_ASSERT(b.ptr[b.len] == '\0');
+ sbuf_clear(&b);
+ TEST_ASSERT(b.len == 0);
+ TEST_ASSERT(b.ptr && b.ptr[0] == '\0');
+ sbuf_free(&b);
+}
+
static void test_quantize_int8_tanh(void) {
TEST_ASSERT(quantize_int8_tanh(0.0f) == 0);
/* tanh saturates to +-1, scaled by 127. */
@@ -1050,6 +1074,7 @@ static void test_http_server(void) {
int main(void) {
test_base64_rfc4648();
+ test_sbuf_growth_and_formatting();
test_quantize_int8_tanh();
test_encode_embedding_int8();
test_encode_embedding_binary();