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.45 by ayin, Sat Sep 8 20:55:49 2007 UTC vs.
Revision 1.55 by sf-exg, Mon Jan 10 14:07:19 2011 UTC

… …
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
167char * 170const char *
168rxvt_r_basename (const char *str) NOTHROW 171rxvt_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 */
… …
235} 238}
236 239
237/* 240/*
238 * remove leading/trailing space in place. 241 * remove leading/trailing space in place.
239 */ 242 */
240char * 243char *
241rxvt_Str_trim (char *str) NOTHROW 244rxvt_strtrim (char *str) NOTHROW
242{ 245{
243 char *r, *s; 246 char *r, *s;
244 247
245 if (!str || !*str) /* shortcut */ 248 if (!str || !*str) /* shortcut */
246 return str; 249 return str;
… …
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 * Caller should free each entry and array when done
268 */ 270 */
269char ** 271char **
270rxvt_splitcommastring (const char *cs) NOTHROW 272rxvt_strsplit (char delim, const char *str) NOTHROW
271{ 273{
272 int l, n, p; 274 int l, n;
273 const char *s, *t; 275 char *s, *t;
274 char **ret; 276 char **ret;
275 277
276 if ((s = cs) == NULL) 278 s = strdup (str ? str : "");
277 s = "";
278 279
279 for (n = 1, t = s; *t; t++) 280 for (n = 1, t = s; *t; t++)
280 if (*t == ',') 281 if (*t == delim)
281 n++; 282 n++;
282 283
283 ret = (char **)malloc ((n + 1) * sizeof (char *)); 284 ret = (char **)malloc ((n + 1) * sizeof (char *));
284 ret[n] = NULL; 285 ret[n] = NULL;
285 286
286 for (l = 0, t = s; l < n; l++) 287 for (l = 0, t = s; l < n; l++)
287 { 288 {
288 for ( ; *t && *t != ','; t++) ; 289 for (; *t && *t != delim; t++)
289 p = t - s; 290 ;
290 ret[l] = (char *)malloc (p + 1); 291 *t = '\0';
291 strncpy (ret[l], s, p);
292 ret[l][p] = '\0'; 292 ret[l] = s;
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}
299 299
300void 300void *
301rxvt_freecommastring (char **cs) NOTHROW 301rxvt_malloc (size_t size)
302{ 302{
303 for (int i = 0; cs[i]; ++i) 303 void *p = malloc (size);
304 free (cs[i]);
305 304
306 free (cs); 305 if (!p)
307} 306 rxvt_fatal ("memory allocation failure. aborting.\n");
308 307
308 return p;
309}
309 310
311void *
312rxvt_calloc (size_t number, size_t size)
313{
314 void *p = calloc (number, size);
310 315
316 if (!p)
317 rxvt_fatal ("memory allocation failure. aborting.\n");
318
319 return p;
320}
321
322void *
323rxvt_realloc (void *ptr, size_t size)
324{
325 void *p = realloc (ptr, size);
326
327 if (!p)
328 rxvt_fatal ("memory allocation failure. aborting.\n");
329
330 return p;
331}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines