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.40 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.53 by root, Sun Apr 26 01:59:53 2009 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 char *base = strrchr (str, '/');
171 174
172 return (char *) (base ? base + 1 : str); 175 return (char *) (base ? base + 1 : str);
173} 176}
233 static class rxvt_failure_exception rxvt_failure_exception; 236 static class rxvt_failure_exception rxvt_failure_exception;
234 throw (rxvt_failure_exception); 237 throw (rxvt_failure_exception);
235} 238}
236 239
237/* 240/*
238 * check that the first characters of S1 match S2 241 * remove leading/trailing space in place.
239 *
240 * No Match
241 * return: 0
242 * Match
243 * return: strlen (S2)
244 */ 242 */
245int 243char *
246rxvt_Str_match (const char *s1, const char *s2) NOTHROW
247{
248 int n = strlen (s2);
249
250 return ((strncmp (s1, s2, n) == 0) ? n : 0);
251}
252
253const char *
254rxvt_Str_skip_space (const char *str) NOTHROW
255{
256 if (str)
257 while (*str && isspace (*str))
258 str++;
259
260 return str;
261}
262
263/*
264 * remove leading/trailing space and strip-off leading/trailing quotes.
265 * in place.
266 */
267char *
268rxvt_Str_trim (char *str) NOTHROW 244rxvt_strtrim (char *str) NOTHROW
269{ 245{
270 char *r, *s; 246 char *r, *s;
271 247
272 if (!str || !*str) /* shortcut */ 248 if (!str || !*str) /* shortcut */
273 return str; 249 return str;
280 256
281 /* dump return and other trailing whitespace */ 257 /* dump return and other trailing whitespace */
282 while (r > s && isspace (*r)) 258 while (r > s && isspace (*r))
283 r--; 259 r--;
284 260
285#if 0
286 /* skip matching leading/trailing quotes */
287 if (*s == '"' && *r == '"' && n > 1)
288 {
289 s++;
290 n -= 2;
291 }
292#endif
293
294 memmove (str, s, r + 1 - s); 261 memmove (str, s, r + 1 - s);
295 str[r + 1 - s] = 0; 262 str[r + 1 - s] = 0;
296 263
297 return str; 264 return str;
298}
299
300/*
301 * in-place interpretation of string:
302 *
303 * backslash-escaped: "\a\b\E\e\n\r\t", "\octal"
304 * Ctrl chars: ^@ .. ^_, ^?
305 *
306 * Emacs-style: "M-" prefix
307 *
308 * Also,
309 * "M-x" prefixed strings, append "\r" if needed
310 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
311 *
312 * returns the converted string length
313 */
314int
315rxvt_Str_escaped (char *str) NOTHROW
316{
317 char ch, *s, *d;
318 int i, num, append = 0;
319
320 if (!str || !*str)
321 return 0;
322
323 d = s = str;
324
325 if (*s == 'M' && s[1] == '-')
326 {
327 /* Emacs convenience, replace leading `M-..' with `\E..' */
328 *d++ = C0_ESC;
329 s += 2;
330 if (toupper (*s) == 'X')
331 /* append carriage-return for `M-xcommand' */
332 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
333 }
334 for (; (ch = *s++);)
335 {
336 if (ch == '\\')
337 {
338 ch = *s++;
339 if (ch >= '0' && ch <= '7')
340 { /* octal */
341 num = ch - '0';
342 for (i = 0; i < 2; i++, s++)
343 {
344 ch = *s;
345 if (ch < '0' || ch > '7')
346 break;
347 num = num * 8 + ch - '0';
348 }
349 ch = (char)num;
350 }
351 else if (ch == 'a')
352 ch = C0_BEL; /* bell */
353 else if (ch == 'b')
354 ch = C0_BS; /* backspace */
355 else if (ch == 'E' || ch == 'e')
356 ch = C0_ESC; /* escape */
357 else if (ch == 'n')
358 ch = '\n'; /* newline */
359 else if (ch == 'r')
360 ch = '\r'; /* carriage-return */
361 else if (ch == 't')
362 ch = C0_HT; /* tab */
363 }
364 else if (ch == '^')
365 {
366 ch = *s++;
367 ch = toupper (ch);
368 ch = (ch == '?' ? 127 : (ch - '@'));
369 }
370 *d++ = ch;
371 }
372
373 /* ESC] is an XTerm escape sequence, must be terminated */
374 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
375 append = CHAR_ST;
376
377 /* add trailing character as required */
378 if (append && d[-1] != append)
379 *d++ = append;
380 *d = '\0';
381
382 return (d - str);
383} 265}
384 266
385/* 267/*
386 * Split a comma-separated string into an array, stripping leading and 268 * Split a comma-separated string into an array, stripping leading and
387 * trailing spaces from each entry. Empty strings are properly returned 269 * trailing spaces from each entry. Empty strings are properly returned
388 * Caller should free each entry and array when done
389 */ 270 */
390char ** 271char **
391rxvt_splitcommastring (const char *cs) NOTHROW 272rxvt_splitcommastring (const char *cs) NOTHROW
392{ 273{
393 int l, n, p; 274 int l, n, p;
394 const char *s, *t; 275 const char *s, *t;
395 char **ret; 276 char **ret;
407 for (l = 0, t = s; l < n; l++) 288 for (l = 0, t = s; l < n; l++)
408 { 289 {
409 for ( ; *t && *t != ','; t++) ; 290 for ( ; *t && *t != ','; t++) ;
410 p = t - s; 291 p = t - s;
411 ret[l] = (char *)malloc (p + 1); 292 ret[l] = (char *)malloc (p + 1);
412 strncpy (ret[l], s, p); 293 memcpy (ret[l], s, p);
413 ret[l][p] = '\0'; 294 ret[l][p] = '\0';
414 rxvt_Str_trim (ret[l]); 295 rxvt_strtrim (ret[l]);
415 s = ++t; 296 s = ++t;
416 } 297 }
417 298
418 return ret; 299 return ret;
419} 300}
425 free (cs[i]); 306 free (cs[i]);
426 307
427 free (cs); 308 free (cs);
428} 309}
429 310
430/*----------------------------------------------------------------------* 311void *
431 * file searching 312rxvt_malloc (size_t size)
432 */
433
434#ifdef XPM_BACKGROUND
435/*
436 * search for FILE in the current working directory, and within the
437 * colon-delimited PATHLIST, adding the file extension EXT if required.
438 *
439 * FILE is either semi-colon or zero terminated
440 */
441char *
442rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) NOTHROW
443{ 313{
444 int maxpath, len; 314 void *p = malloc (size);
445 const char *p, *path;
446 char name[256];
447 315
448 if (!access (file, R_OK)) /* found (plain name) in current directory */ 316 if (!p)
449 return strdup (file); 317 rxvt_fatal ("memory allocation failure. aborting.\n");
450 318
451 /* semi-colon delimited */
452 if ((p = strchr (file, ';')))
453 len = (p - file);
454 else
455 len = strlen (file);
456
457 /* leave room for an extra '/' and trailing '\0' */
458 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
459 if (maxpath <= 0)
460 return NULL;
461
462 /* check if we can find it now */
463 strncpy (name, file, len);
464 name[len] = '\0';
465
466 if (!access (name, R_OK))
467 return strdup (name);
468 if (ext)
469 {
470 strcat (name, ext);
471 if (!access (name, R_OK))
472 return strdup (name);
473 }
474 for (path = pathlist; path != NULL && *path != '\0'; path = p)
475 {
476 int n;
477
478 /* colon delimited */
479 if ((p = strchr (path, ':')) == NULL)
480 p = strchr (path, '\0');
481
482 n = (p - path);
483 if (*p != '\0')
484 p++;
485
486 if (n > 0 && n <= maxpath)
487 {
488 strncpy (name, path, n);
489 if (name[n - 1] != '/')
490 name[n++] = '/';
491 name[n] = '\0';
492 strncat (name, file, len);
493
494 if (!access (name, R_OK))
495 return strdup (name);
496 if (ext)
497 {
498 strcat (name, ext);
499 if (!access (name, R_OK))
500 return strdup (name);
501 }
502 }
503 }
504 return NULL;
505}
506
507char *
508rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW
509{
510 char *f;
511
512 if (file == NULL || *file == '\0')
513 return NULL;
514
515 f = rxvt_File_search_path (path, file, ext);
516
517 return f; 319 return p;
518} 320}
519#endif
520 321
322void *
323rxvt_calloc (size_t number, size_t size)
324{
325 void *p = calloc (number, size);
521 326
327 if (!p)
328 rxvt_fatal ("memory allocation failure. aborting.\n");
329
330 return p;
331}
332
333void *
334rxvt_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}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines