Merge tag 'v3.12-rc4' into next

Merge with mainline to bring in changes to input subsystem that were
committed through other trees.

1 files changed, 24 insertions, 0 deletions

diff --git a/tools/perf/util/string.c b/tools/perf/util/string.c
index 29c7b2cb2521..f0b0c008c507 100644
--- a/tools/perf/util/string.c
+++ b/tools/perf/util/string.c
@@ -387,3 +387,27 @@ void *memdup(const void *src, size_t len)
 
         return p;
 }
+
+/**
+ * str_append - reallocate string and append another
+ * @s: pointer to string pointer
+ * @len: pointer to len (initialized)
+ * @a: string to append.
+ */
+int str_append(char **s, int *len, const char *a)
+{
+        int olen = *s ? strlen(*s) : 0;
+        int nlen = olen + strlen(a) + 1;
+        if (*len < nlen) {
+                *len = *len * 2;
+                if (*len < nlen)
+                        *len = nlen;
+                *s = realloc(*s, *len);
+                if (!*s)
+                        return -ENOMEM;
+                if (olen == 0)
+                        **s = 0;
+        }
+        strcat(*s, a);
+        return 0;
+}