diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 5d54861120cf56499ac047e85307ddf702f3a8c8..6674c679dcfaac62e1644ec2b079772d19668e63 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1083,6 +1083,7 @@ virBitmapToData;
virBufferAdd;
virBufferAddBuffer;
virBufferAddChar;
+virBufferAddStr;
virBufferAdjustIndent;
virBufferAsprintf;
virBufferCheckErrorInternal;
diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 96a0f16d57ccc8a158b94631514a2056b608b096..b5639a83d2ebce0d559c0cca2e6310b5fc614e98 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -752,3 +752,32 @@ virBufferTrim(virBufferPtr buf, const char *str, int len)
buf->use -= len < 0 ? len2 : len;
buf->content[buf->use] = '\0';
}
+
+
+/**
+ * virBufferAddStr:
+ * @buf: the buffer to append to
+ * @str: string to append
+ *
+ * Appends @str to @buffer. Applies autoindentation on the separate lines of
+ * @str.
+ */
+void
+virBufferAddStr(virBufferPtr buf,
+ const char *str)
+{
+ const char *end;
+
+ if (!buf || !str || buf->error)
+ return;
+
+ while (*str) {
+ if ((end = strchr(str, '\n'))) {
+ virBufferAdd(buf, str, (end - str) + 1);
+ str = end + 1;
+ } else {
+ virBufferAdd(buf, str, -1);
+ break;
+ }
+ }
+}
diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index 24e81c766cdaf13a06a3c309a98053c939ae4d85..144a1ba06e152d08876b42e07146fe2713093b04 100644
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -96,5 +96,6 @@ void virBufferAdjustIndent(virBufferPtr buf, int indent);
int virBufferGetIndent(const virBuffer *buf, bool dynamic);
void virBufferTrim(virBufferPtr buf, const char *trim, int len);
+void virBufferAddStr(virBufferPtr buf, const char *str);
#endif /* __VIR_BUFFER_H__ */
diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index f964febd27e874b0b63fc93f8299c6b96ed4d73e..21cb18b4aa72224622ddcccd0d1f3bf113cd2d3c 100644
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -310,6 +310,43 @@ static int testBufAddBuffer(const void *data ATTRIBUTE_UNUSED)
return ret;
}
+struct testBufAddStrData {
+ const char *data;
+ const char *expect;
+};
+
+static int
+testBufAddStr(const void *opaque ATTRIBUTE_UNUSED)
+{
+ const struct testBufAddStrData *data = opaque;
+ virBuffer buf = VIR_BUFFER_INITIALIZER;
+ char *actual;
+ int ret = -1;
+
+ virBufferAddLit(&buf, "\n");
+ virBufferAdjustIndent(&buf, 2);
+ virBufferAddStr(&buf, data->data);
+ virBufferAdjustIndent(&buf, -2);
+ virBufferAddLit(&buf, "");
+
+ if (!(actual = virBufferContentAndReset(&buf))) {
+ TEST_ERROR("buf is empty");
+ goto cleanup;
+ }
+
+ if (STRNEQ_NULLABLE(actual, data->expect)) {
+ TEST_ERROR("testBufAddStr(): Strings don't match:\n");
+ virtTestDifference(stderr, data->expect, actual);
+ goto cleanup;
+ }
+
+ ret = 0;
+
+ cleanup:
+ VIR_FREE(actual);
+ return ret;
+}
+
static int
mymain(void)
@@ -330,6 +367,18 @@ mymain(void)
DO_TEST("Trim", testBufTrim, 0);
DO_TEST("AddBuffer", testBufAddBuffer, 0);
+#define DO_TEST_ADD_STR(DATA, EXPECT) \
+ do { \
+ struct testBufAddStrData info = { DATA, EXPECT }; \
+ if (virtTestRun("Buf: AddStr", testBufAddStr, &info) < 0) \
+ ret = -1; \
+ } while (0)
+
+ DO_TEST_ADD_STR("", "\n");
+ DO_TEST_ADD_STR("", "\n ");
+ DO_TEST_ADD_STR("\n", "\n \n");
+ DO_TEST_ADD_STR("\n \n\n", "\n \n \n \n");
+
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
}