… | |
… | |
38 | while (len--) |
38 | while (len--) |
39 | { |
39 | { |
40 | ssize_t l = wcrtomb (dst, *str++, mbs); |
40 | ssize_t l = wcrtomb (dst, *str++, mbs); |
41 | |
41 | |
42 | if (l < 0) |
42 | if (l < 0) |
|
|
43 | { |
43 | *dst++ = '?'; |
44 | *dst++ = '?'; |
|
|
45 | wcrtomb (0, 0, mbs); // reset undefined state |
|
|
46 | } |
44 | else |
47 | else |
45 | dst += l; |
48 | dst += l; |
46 | } |
49 | } |
47 | |
50 | |
48 | *dst++ = 0; |
51 | *dst++ = 0; |
… | |
… | |
79 | *p++ = w; |
82 | *p++ = w; |
80 | else if (w < 0x000800) |
83 | else if (w < 0x000800) |
81 | *p++ = 0xc0 | ( w >> 6), |
84 | *p++ = 0xc0 | ( w >> 6), |
82 | *p++ = 0x80 | ( w & 0x3f); |
85 | *p++ = 0x80 | ( w & 0x3f); |
83 | else if (w < 0x010000) |
86 | else if (w < 0x010000) |
84 | *p++ = 0xe0 | ( w >> 12 ), |
87 | *p++ = 0xe0 | ( w >> 12), |
85 | *p++ = 0x80 | ((w >> 6) & 0x3f), |
88 | *p++ = 0x80 | ((w >> 6) & 0x3f), |
86 | *p++ = 0x80 | ( w & 0x3f); |
89 | *p++ = 0x80 | ( w & 0x3f); |
87 | else if (w < 0x110000) |
90 | else if (w < 0x110000) |
88 | *p++ = 0xf0 | ( w >> 18), |
91 | *p++ = 0xf0 | ( w >> 18), |
89 | *p++ = 0x80 | ((w >> 12) & 0x3f), |
92 | *p++ = 0x80 | ((w >> 12) & 0x3f), |
… | |
… | |
116 | if (len == 0) |
119 | if (len == 0) |
117 | break; |
120 | break; |
118 | else if (s[0] < 0x80) |
121 | else if (s[0] < 0x80) |
119 | *p++ = *s++; |
122 | *p++ = *s++; |
120 | else if (len >= 2 |
123 | else if (len >= 2 |
121 | && s[0] >= 0xc2 && s[0] <= 0xdf |
124 | && s[0] >= 0xc2 && s[0] <= 0xdf |
122 | && (s[1] & 0xc0) == 0x80) |
125 | && (s[1] & 0xc0) == 0x80) |
123 | { |
126 | { |
124 | *p++ = ((s[0] & 0x1f) << 6) |
127 | *p++ = ((s[0] & 0x1f) << 6) |
125 | | (s[1] & 0x3f); |
128 | | (s[1] & 0x3f); |
126 | s += 2; |
129 | s += 2; |
… | |
… | |
144 | || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) |
147 | || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) |
145 | ) |
148 | ) |
146 | && (s[2] & 0xc0) == 0x80 |
149 | && (s[2] & 0xc0) == 0x80 |
147 | && (s[3] & 0xc0) == 0x80) |
150 | && (s[3] & 0xc0) == 0x80) |
148 | { |
151 | { |
149 | *p++ = ((s[0] & 0x07) << 18) |
152 | *p++ = ((s[0] & 0x07) << 18) |
150 | | ((s[1] & 0x3f) << 12) |
153 | | ((s[1] & 0x3f) << 12) |
151 | | ((s[2] & 0x3f) << 6) |
154 | | ((s[2] & 0x3f) << 6) |
152 | | (s[3] & 0x3f); |
155 | | (s[3] & 0x3f); |
153 | s += 4; |
156 | s += 4; |
154 | } |
157 | } |
155 | else |
158 | else |
156 | { |
159 | { |
… | |
… | |
162 | *p = 0; |
165 | *p = 0; |
163 | |
166 | |
164 | return r; |
167 | return r; |
165 | } |
168 | } |
166 | |
169 | |
167 | char * |
170 | const char * |
168 | rxvt_basename (const char *str) NOTHROW |
171 | rxvt_basename (const char *str) NOTHROW |
169 | { |
172 | { |
170 | char *base = strrchr (str, '/'); |
173 | char *base = strrchr (str, '/'); |
171 | |
174 | |
172 | return (char *) (base ? base + 1 : str); |
175 | return (char *) (base ? base + 1 : str); |
… | |
… | |
285 | for (l = 0, t = s; l < n; l++) |
288 | for (l = 0, t = s; l < n; l++) |
286 | { |
289 | { |
287 | for ( ; *t && *t != ','; t++) ; |
290 | for ( ; *t && *t != ','; t++) ; |
288 | p = t - s; |
291 | p = t - s; |
289 | ret[l] = (char *)malloc (p + 1); |
292 | ret[l] = (char *)malloc (p + 1); |
290 | strncpy (ret[l], s, p); |
293 | memcpy (ret[l], s, p); |
291 | ret[l][p] = '\0'; |
294 | ret[l][p] = '\0'; |
292 | rxvt_strtrim (ret[l]); |
295 | rxvt_strtrim (ret[l]); |
293 | s = ++t; |
296 | s = ++t; |
294 | } |
297 | } |
295 | |
298 | |
… | |
… | |
303 | free (cs[i]); |
306 | free (cs[i]); |
304 | |
307 | |
305 | free (cs); |
308 | free (cs); |
306 | } |
309 | } |
307 | |
310 | |
|
|
311 | void * |
|
|
312 | rxvt_malloc (size_t size) |
|
|
313 | { |
|
|
314 | void *p = malloc (size); |
308 | |
315 | |
|
|
316 | if (!p) |
|
|
317 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
309 | |
318 | |
|
|
319 | return p; |
|
|
320 | } |
|
|
321 | |
|
|
322 | void * |
|
|
323 | rxvt_calloc (size_t number, size_t size) |
|
|
324 | { |
|
|
325 | void *p = calloc (number, size); |
|
|
326 | |
|
|
327 | if (!p) |
|
|
328 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
|
|
329 | |
|
|
330 | return p; |
|
|
331 | } |
|
|
332 | |
|
|
333 | void * |
|
|
334 | rxvt_realloc (void *ptr, size_t size) |
|
|
335 | { |
|
|
336 | void *p = realloc (ptr, size); |
|
|
337 | |
|
|
338 | if (!p) |
|
|
339 | rxvt_fatal ("memory allocation failure. aborting.\n"); |
|
|
340 | |
|
|
341 | return p; |
|
|
342 | } |