ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/misc.C
(Generate patch)

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.19 by root, Sun Dec 12 06:30:25 2004 UTC vs.
Revision 1.21 by root, Mon Dec 13 07:26:18 2004 UTC

101wchar_t * 101wchar_t *
102rxvt_utf8towcs (const char *str, int len) 102rxvt_utf8towcs (const char *str, int len)
103{ 103{
104 if (len < 0) len = strlen (str); 104 if (len < 0) len = strlen (str);
105 105
106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)),
107 wchar_t *p = r; 107 *p = r;
108 108
109 unsigned char *s = (unsigned char *)str; 109 unsigned char *s = (unsigned char *)str,
110 *e = s + len;
110 111
111 while (len--) 112 for (;;)
112 { 113 {
114 len = e - s;
115
116 if (len == 0)
117 break;
113 if (s[0] < 0x80) 118 else if (s[0] < 0x80)
114 *p++ = *s++; 119 *p++ = *s++;
115 else if (len > 0 120 else if (len >= 2
116 && s[0] >= 0xc2 && s[0] <= 0xdf 121 && s[0] >= 0xc2 && s[0] <= 0xdf
117 && (s[1] & 0xc0) == 0x80) 122 && (s[1] & 0xc0) == 0x80)
118 { 123 {
119 *p++ = ((s[0] & 0x1f) << 6) 124 *p++ = ((s[0] & 0x1f) << 6)
120 | (s[1] & 0x3f); 125 | (s[1] & 0x3f);
121 s += 2; 126 s += 2;
122 } 127 }
123 else if (len > 1 128 else if (len >= 3
124 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf) 129 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
125 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf) 130 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
126 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f) 131 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
127 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf) 132 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
128 ) 133 )
131 *p++ = ((s[0] & 0x0f) << 12) 136 *p++ = ((s[0] & 0x0f) << 12)
132 | ((s[1] & 0x3f) << 6) 137 | ((s[1] & 0x3f) << 6)
133 | (s[2] & 0x3f); 138 | (s[2] & 0x3f);
134 s += 3; 139 s += 3;
135 } 140 }
136 else if (len > 2 141 else if (len >= 4
137 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf) 142 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
138 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf) 143 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
139 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) 144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
140 ) 145 )
141 && (s[2] & 0xc0) == 0x80 146 && (s[2] & 0xc0) == 0x80

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines