Re: [PATCH] upgrade bytes_to_uni

Message-Id: <20060515223901.F3B0.BQW10602@nifty.com>

p4raw-id: //depot/perl@28209

1 files changed, 6 insertions, 14 deletions

diff --git a/pp_pack.c b/pp_pack.c
index 3fa0e74af0..d090c7dc77 100644
--- a/pp_pack.c
+++ b/pp_pack.c
@@ -707,20 +707,12 @@ S_bytes_to_uni(pTHX_ const U8 *start, STRLEN len, char *dest) {
     const U8 * const end = start + len;
 
     while (start < end) {
-	U8 buffer[UTF8_MAXLEN];
-        const int length =
-	    uvuni_to_utf8_flags(buffer, NATIVE_TO_UNI(*start), 0) - buffer;
-	switch(length) {
-	  case 1:
-	    *dest++ = buffer[0];
-	    break;
-	  case 2:
-	    *dest++ = buffer[0];
-	    *dest++ = buffer[1];
-	    break;
-	  default:
-	    Perl_croak(aTHX_ "Perl bug: value %d UTF-8 expands to %d bytes",
-		       *start, length);
+	const UV uv = NATIVE_TO_ASCII(*start);
+	if (UNI_IS_INVARIANT(uv))
+	    *dest++ = (char)(U8)UTF_TO_NATIVE(uv);
+	else {
+	    *dest++ = (char)(U8)UTF8_EIGHT_BIT_HI(uv);
+	    *dest++ = (char)(U8)UTF8_EIGHT_BIT_LO(uv);
 	}
 	start++;
     }