X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fctype%2Fiswprint.c;h=86f9d646ac9e16251120ba09366537da92c102b4;hb=06d4075a50b84d4b80e09eb5662fc1153bd559f7;hp=7717671ad18928eb140ef1f08bf919dae9890f92;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/ctype/iswprint.c b/src/ctype/iswprint.c
index 7717671a..86f9d646 100644
--- a/src/ctype/iswprint.c
+++ b/src/ctype/iswprint.c
@@ -1,10 +1,26 @@
 #include <wctype.h>
 
+/* Consider all legal codepoints as printable except for:
+ * - C0 and C1 control characters
+ * - U+2028 and U+2029 (line/para break)
+ * - U+FFF9 through U+FFFB (interlinear annotation controls)
+ * The following code is optimized heavily to make hot paths for the
+ * expected printable characters. */
+
 int iswprint(wint_t wc)
 {
-	unsigned c = wc;
-	/* assume any non-control, non-illegal codepoint is printable */
-	if (c>0x10ffff || c-0xd800<0x800 || (c&0xfffe)==0xfffe || iswcntrl(c))
+	if (wc < 0xffU)
+		return (wc+1 & 0x7f) >= 0x21;
+	if (wc < 0x2028U || wc-0x202aU < 0xd800-0x202a || wc-0xe000U < 0xfff9-0xe000)
+		return 1;
+	if (wc-0xfffcU > 0x10ffff-0xfffc || (wc&0xfffe)==0xfffe)
 		return 0;
 	return 1;
 }
+
+int __iswprint_l(wint_t c, locale_t l)
+{
+	return iswprint(c);
+}
+
+weak_alias(__iswprint_l, iswprint_l);