… | |
… | |
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; |
… | |
… | |
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); |