From: Russ Cox <rsc@golang.org>
Date: Thu, 7 Mar 2013 19:38:49 +0000 (-0500)
Subject: lib9: fix windows build (don't use runesmprint)
X-Git-Tag: go1.1rc2~643
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5641a09171ce220b6eb28631dce6a1243dc78e12;p=gostls13.git

lib9: fix windows build (don't use runesmprint)

TBR=golang-dev
CC=golang-dev
https://golang.org/cl/7575046
---

diff --git a/src/lib9/tempdir_windows.c b/src/lib9/tempdir_windows.c
index 8e9322dc82..1a530059ae 100644
--- a/src/lib9/tempdir_windows.c
+++ b/src/lib9/tempdir_windows.c
@@ -30,18 +30,16 @@ WinRune*
 torune(char *p)
 {
 	int i, n;
-	Rune *r1;
+	Rune rr;
 	WinRune *r;
 	
-	r1 = runesmprint("%s", p);
-	n = 0;
-	while(r1[n] != '\0')
-		n++;
-	n++;
-	r = malloc(n*sizeof r[0]);
-	for(i=0; i<n; i++)
-		r[i] = r1[i];
-	free(r1);
+	n = utflen(p);
+	r = malloc((n+1)*sizeof r[0]);
+	for(i=0; i<n; i++) {
+		p += chartorune(&rr, p);
+		r[i] = rr;
+	}
+	r[n] = '\0';
 	return r;
 }