X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fstrv.c;h=607c221ae66790b86311bdc36625039e2f401c20;hp=3e7778d61ca663eab8c2f23f9d024ef14ffa842c;hb=0461f8cdc1d7b4afee2f2ff40fcaa3c7e26c662c;hpb=e21fea24ae2a7a04f6d5c9d2bbbaf5833d248952

diff --git a/src/shared/strv.c b/src/shared/strv.c
index 3e7778d61..607c221ae 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -356,6 +356,43 @@ char *strv_join(char **l, const char *separator) {
         return r;
 }
 
+char *strv_join_quoted(char **l) {
+        char *buf = NULL;
+        char **s;
+        size_t allocated = 0, len = 0;
+
+        STRV_FOREACH(s, l) {
+                /* assuming here that escaped string cannot be more
+                 * than twice as long, and reserving space for the
+                 * separator and quotes.
+                 */
+                _cleanup_free_ char *esc = NULL;
+                size_t needed;
+
+                if (!GREEDY_REALLOC(buf, allocated,
+                                    len + strlen(*s) * 2 + 3))
+                        goto oom;
+
+                esc = cescape(*s);
+                if (!esc)
+                        goto oom;
+
+                needed = snprintf(buf + len, allocated - len, "%s\"%s\"",
+                                  len > 0 ? " " : "", esc);
+                assert(needed < allocated - len);
+                len += needed;
+        }
+
+        if (!buf)
+                buf = malloc0(1);
+
+        return buf;
+
+ oom:
+        free(buf);
+        return NULL;
+}
+
 char **strv_append(char **l, const char *s) {
         char **r, **k;
 
@@ -387,21 +424,6 @@ fail:
         return NULL;
 }
 
-char **strv_appendf(char **l, const char *format, ...) {
-        va_list ap;
-        _cleanup_free_ char *s = NULL;
-        int r;
-
-        va_start(ap, format);
-        r = vasprintf(&s, format, ap);
-        va_end(ap);
-
-        if (r < 0)
-                return NULL;
-
-        return strv_append(l, s);
-}
-
 int strv_push(char ***l, char *value) {
         char **c;
         unsigned n;
@@ -509,7 +531,7 @@ char **strv_parse_nulstr(const char *s, size_t l) {
         assert(s || l <= 0);
 
         if (l <= 0)
-                return strv_new(NULL, NULL);
+                return new0(char*, 1);
 
         for (p = s; p < s + l; p++)
                 if (*p == 0)