]> Cypherpunks repositories - gostls13.git/commitdiff
lib9: fix windows build (don't use runesmprint)
authorRuss Cox <rsc@golang.org>
Thu, 7 Mar 2013 19:38:49 +0000 (14:38 -0500)
committerRuss Cox <rsc@golang.org>
Thu, 7 Mar 2013 19:38:49 +0000 (14:38 -0500)
TBR=golang-dev
CC=golang-dev
https://golang.org/cl/7575046

src/lib9/tempdir_windows.c

index 8e9322dc82589606ee7f3536e4388b38e59bb318..1a530059aece51d2350dccc43ebb9568be7879d7 100644 (file)
@@ -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;
 }