From: Evan Nemerson <evan@coeus-group.com>
Date: Sat, 25 Jan 2014 07:21:05 +0000 (-0800)
Subject: glib-2.0: make string.joinv handle non-null-terminated arrays
X-Git-Tag: 0.23.2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c0674fafe5d11362fe3f88bb4c849c34789b5d5;p=thirdparty%2Fvala.git

glib-2.0: make string.joinv handle non-null-terminated arrays

Fixes bug 686451.
---

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index b4c421287..7f867b5bf 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -957,8 +957,33 @@ public class string {
 	public string[] split (string delimiter, int max_tokens = 0);
 	[CCode (cname = "g_strsplit_set", array_length = false, array_null_terminated = true)]
 	public string[] split_set (string delimiters, int max_tokens = 0);
-	[CCode (cname = "g_strjoinv")]
-	public static string joinv (string separator, [CCode (array_length = false, array_null_terminated = true)] string[] str_array);
+	[CCode (cname = "g_stpcpy")]
+	private static void* copy_to_buffer (void* dest, string src);
+	[CCode (cname = "_vala_g_strjoinv")]
+	public static string joinv (string? separator, string[]? str_array) {
+		if (separator == null) {
+			separator = "";
+		}
+		if (str_array != null) {
+			int i;
+			size_t len = 1;
+			for (i = 0 ; (str_array.length != -1 && i < str_array.length) || (str_array.length == -1 && str_array[i] != null) ; i++) {
+				len += str_array[i].length;
+			}
+			len += separator.length * (i - 1);
+
+			string* res = GLib.malloc (len);
+			void* ptr = string.copy_to_buffer ((void*) res, str_array[0]);
+			for (i = 1 ; str_array[i] != null ; i++) {
+				ptr = string.copy_to_buffer (ptr, separator);
+				ptr = string.copy_to_buffer (ptr, str_array[i]);
+			}
+
+			return (owned) res;
+		} else {
+			return "";
+		}
+	}
 	[CCode (cname = "g_strjoin")]
 	public static string join (string separator, ...);
 	[CCode (cname = "g_strnfill")]