From 311e3b51c6b1bde2f58968453de56a5ca2a6dbb4 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Wed, 26 Sep 2018 14:32:17 +0200
Subject: libc: return number of bytes produced for idn2utf() and utf2idn()

---
 sys/src/libc/9sys/idn.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'sys/src/libc')

diff --git a/sys/src/libc/9sys/idn.c b/sys/src/libc/9sys/idn.c
index 94ff023a5..d3ad55dd8 100644
--- a/sys/src/libc/9sys/idn.c
+++ b/sys/src/libc/9sys/idn.c
@@ -184,7 +184,7 @@ punydecode(uint input_length, char input[], uint max_out, Rune output[])
  * convert punycode encoded internationalized
  * domain name to unicode string
  */
-char*
+int
 idn2utf(char *name, char *buf, int nbuf)
 {
 	char *dp, *de, *cp;
@@ -205,24 +205,24 @@ idn2utf(char *name, char *buf, int nbuf)
 		}
 		if(cistrncmp(cp, "xn--", 4) == 0)
 			if((nr = punydecode(nc-4, cp+4, nelem(rb), rb)) < 0)
-				return nil;
+				return -1;
 		dp = seprint(dp, de, "%.*S", nr, rb);
 		if(dp >= de)
-			return nil;
+			return -1;
 		if(cp[nc] == 0)
 			break;
 		*dp++ = '.';
 		cp += nc+1;
 	}
 	*dp = 0;
-	return buf;
+	return dp - buf;
 }
 
 /*
  * convert unicode string to punycode
  * encoded internationalized domain name
  */
-char*
+int
 utf2idn(char *name, char *buf, int nbuf)
 {
 	char *dp, *de, *cp;
@@ -246,17 +246,17 @@ utf2idn(char *name, char *buf, int nbuf)
 		else {
 			dp = seprint(dp, de, "xn--");
 			if((n = punyencode(nr, rb, de - dp, dp)) < 0)
-				return nil;
+				return -1;
 			dp += n;
 		}
 		if(dp >= de)
-			return nil;
+			return -1;
 		if(cp[nc] == 0)
 			break;
 		*dp++ = '.';
 		cp += nc+1;
 	}
 	*dp = 0;
-	return buf;
+	return dp - buf;
 }
 
-- 
cgit v1.2.3