… | |
… | |
163 | |
163 | |
164 | return r; |
164 | return r; |
165 | } |
165 | } |
166 | |
166 | |
167 | char * |
167 | char * |
168 | rxvt_r_basename (const char *str) NOTHROW |
168 | rxvt_basename (const char *str) NOTHROW |
169 | { |
169 | { |
170 | char *base = strrchr (str, '/'); |
170 | char *base = strrchr (str, '/'); |
171 | |
171 | |
172 | return (char *) (base ? base + 1 : str); |
172 | return (char *) (base ? base + 1 : str); |
173 | } |
173 | } |
… | |
… | |
236 | |
236 | |
237 | /* |
237 | /* |
238 | * remove leading/trailing space in place. |
238 | * remove leading/trailing space in place. |
239 | */ |
239 | */ |
240 | char * |
240 | char * |
241 | rxvt_Str_trim (char *str) NOTHROW |
241 | rxvt_strtrim (char *str) NOTHROW |
242 | { |
242 | { |
243 | char *r, *s; |
243 | char *r, *s; |
244 | |
244 | |
245 | if (!str || !*str) /* shortcut */ |
245 | if (!str || !*str) /* shortcut */ |
246 | return str; |
246 | return str; |
… | |
… | |
288 | for ( ; *t && *t != ','; t++) ; |
288 | for ( ; *t && *t != ','; t++) ; |
289 | p = t - s; |
289 | p = t - s; |
290 | ret[l] = (char *)malloc (p + 1); |
290 | ret[l] = (char *)malloc (p + 1); |
291 | strncpy (ret[l], s, p); |
291 | strncpy (ret[l], s, p); |
292 | ret[l][p] = '\0'; |
292 | ret[l][p] = '\0'; |
293 | rxvt_Str_trim (ret[l]); |
293 | rxvt_strtrim (ret[l]); |
294 | s = ++t; |
294 | s = ++t; |
295 | } |
295 | } |
296 | |
296 | |
297 | return ret; |
297 | return ret; |
298 | } |
298 | } |