strbuf: add strbuf_addbuf_percentquote

This is handy for creating strings which will be fed to printf() or
strbuf_expand().

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt
index 3b1da10f263dad08ad327d678da9ada32c83599f..afe27599511c5f6bab6e4f799fd18e7d83bdd454 100644 (file)
--- a/Documentation/technical/api-strbuf.txt
+++ b/Documentation/technical/api-strbuf.txt
@@ -218,6 +218,13 @@ which can be used by the programmer of the callback as she sees fit.
        placeholder and replacement string.  The array needs to be
        terminated by an entry with placeholder set to NULL.
 
        placeholder and replacement string.  The array needs to be
        terminated by an entry with placeholder set to NULL.
 

+`strbuf_addbuf_percentquote`::
+
+       Append the contents of one strbuf to another, quoting any
+       percent signs ("%") into double-percents ("%%") in the
+       destination. This is useful for literal data to be fed to either
+       strbuf_expand or to the *printf family of functions.
+

 `strbuf_addf`::
 
        Add a formatted string to the buffer.
 `strbuf_addf`::
 
        Add a formatted string to the buffer.

diff --git a/strbuf.c b/strbuf.c
index 6cbc1fcfd86e45c85fda079f8bce8895adbcb3a4..af9130e52d877bc49748dd5e2db9c5912ab08837 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -257,6 +257,17 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder,
        return 0;
 }
 
        return 0;
 }
 

+void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src)
+{
+       int i, len = src->len;
+
+       for (i = 0; i < len; i++) {
+               if (src->buf[i] == '%')
+                       strbuf_addch(dst, '%');
+               strbuf_addch(dst, src->buf[i]);
+       }
+}
+

 size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
 {
        size_t res;
 size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
 {
        size_t res;

diff --git a/strbuf.h b/strbuf.h
index fa07ecf094bd3ef8997958fde29199f8fb6421b9..84ac9424b5446aa82ac79045ad020f9ecfc0f75f 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -116,6 +116,7 @@ struct strbuf_expand_dict_entry {
        const char *value;
 };
 extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context);
        const char *value;
 };
 extern size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder, void *context);

+extern void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);

 
 __attribute__((format (printf,2,3)))
 extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);
 
 __attribute__((format (printf,2,3)))
 extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...);