Merge tag 'dm-4.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

[cascardo/linux.git] / tools / perf / util / quote.c

diff --git a/tools/perf/util/quote.c b/tools/perf/util/quote.c
index 01f0324..c6d4ee2 100644 (file)
--- a/tools/perf/util/quote.c
+++ b/tools/perf/util/quote.c
@@ -17,38 +17,42 @@ static inline int need_bs_quote(char c)
        return (c == '\'' || c == '!');
 }
 
-static void sq_quote_buf(struct strbuf *dst, const char *src)
+static int sq_quote_buf(struct strbuf *dst, const char *src)
 {
        char *to_free = NULL;
+       int ret;
 
        if (dst->buf == src)
                to_free = strbuf_detach(dst, NULL);
 
-       strbuf_addch(dst, '\'');
-       while (*src) {
+       ret = strbuf_addch(dst, '\'');
+       while (!ret && *src) {
                size_t len = strcspn(src, "'!");
-               strbuf_add(dst, src, len);
+               ret = strbuf_add(dst, src, len);
                src += len;
-               while (need_bs_quote(*src)) {
-                       strbuf_addstr(dst, "'\\");
-                       strbuf_addch(dst, *src++);
-                       strbuf_addch(dst, '\'');
-               }
+               while (!ret && need_bs_quote(*src))
+                       ret = strbuf_addf(dst, "'\\%c\'", *src++);
        }
-       strbuf_addch(dst, '\'');
+       if (!ret)
+               ret = strbuf_addch(dst, '\'');
        free(to_free);
+
+       return ret;
 }
 
-void sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
+int sq_quote_argv(struct strbuf *dst, const char** argv, size_t maxlen)
 {
-       int i;
+       int i, ret;
 
        /* Copy into destination buffer. */
-       strbuf_grow(dst, 255);
-       for (i = 0; argv[i]; ++i) {
-               strbuf_addch(dst, ' ');
-               sq_quote_buf(dst, argv[i]);
+       ret = strbuf_grow(dst, 255);
+       for (i = 0; !ret && argv[i]; ++i) {
+               ret = strbuf_addch(dst, ' ');
+               if (ret)
+                       break;
+               ret = sq_quote_buf(dst, argv[i]);
                if (maxlen && dst->len > maxlen)
                        die("Too many or long arguments");
        }
+       return ret;
 }