… | |
… | |
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 | const char *base = strrchr (str, '/'); |
171 | |
174 | |
172 | return (char *) (base ? base + 1 : str); |
175 | return base ? base + 1 : str; |
173 | } |
176 | } |
174 | |
177 | |
175 | /* |
178 | /* |
176 | * Print an error message |
179 | * Print an error message |
177 | */ |
180 | */ |
… | |
… | |
260 | |
263 | |
261 | return str; |
264 | return str; |
262 | } |
265 | } |
263 | |
266 | |
264 | /* |
267 | /* |
265 | * Split a comma-separated string into an array, stripping leading and |
268 | * Split a string into an array based on the given delimiter, stripping leading and |
266 | * trailing spaces from each entry. Empty strings are properly returned |
269 | * trailing spaces from each entry. Empty strings are properly returned |
267 | */ |
270 | */ |
268 | char ** |
271 | char ** |
269 | rxvt_splitcommastring (const char *cs) NOTHROW |
272 | rxvt_strsplit (char delim, const char *str) NOTHROW |
270 | { |
273 | { |
271 | int l, n, p; |
274 | int l, n; |
272 | const char *s, *t; |
275 | char *s, *t; |
273 | char **ret; |
276 | char **ret; |
274 | |
277 | |
275 | if ((s = cs) == NULL) |
278 | s = strdup (str ? str : ""); |
276 | s = ""; |
|
|
277 | |
279 | |
278 | for (n = 1, t = s; *t; t++) |
280 | for (n = 1, t = s; *t; t++) |
279 | if (*t == ',') |
281 | if (*t == delim) |
280 | n++; |
282 | n++; |
281 | |
283 | |
282 | ret = (char **)malloc ((n + 1) * sizeof (char *)); |
284 | ret = (char **)malloc ((n + 1) * sizeof (char *)); |
283 | ret[n] = NULL; |
285 | ret[n] = NULL; |
284 | |
286 | |
285 | for (l = 0, t = s; l < n; l++) |
287 | for (l = 0, t = s; l < n; l++) |
286 | { |
288 | { |
287 | for ( ; *t && *t != ','; t++) ; |
289 | for (; *t && *t != delim; t++) |
288 | p = t - s; |
290 | ; |
289 | ret[l] = (char *)malloc (p + 1); |
291 | *t = '\0'; |
290 | memcpy (ret[l], s, p); |
|
|
291 | ret[l][p] = '\0'; |
292 | ret[l] = s; |
292 | rxvt_strtrim (ret[l]); |
293 | rxvt_strtrim (ret[l]); |
293 | s = ++t; |
294 | s = ++t; |
294 | } |
295 | } |
295 | |
296 | |
296 | return ret; |
297 | return ret; |
297 | } |
298 | } |
298 | |
299 | |
299 | void |
|
|
300 | rxvt_freecommastring (char **cs) NOTHROW |
|
|
301 | { |
|
|
302 | for (int i = 0; cs[i]; ++i) |
|
|
303 | free (cs[i]); |
|
|
304 | |
|
|
305 | free (cs); |
|
|
306 | } |
|
|
307 | |
|
|
308 | void * |
300 | void * |
309 | rxvt_malloc (size_t size) |
301 | rxvt_malloc (size_t size) |
310 | { |
302 | { |
311 | void *p = malloc (size); |
303 | void *p = malloc (size); |
312 | |
304 | |