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.12 by pcg, Wed Mar 17 05:15:02 2004 UTC vs.
Revision 1.34 by root, Mon Jan 16 16:19:19 2006 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: misc.c 2 * File: misc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston 6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *----------------------------------------------------------------------*/ 24 *----------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28#include "misc.intpro" /* PROTOS for internal routines */
29 28
30/* EXTPROTO */
31char * 29char *
32rxvt_wcstombs (const wchar_t *str, int len) 30rxvt_wcstombs (const wchar_t *str, int len)
33{ 31{
32 if (len < 0) len = wcslen (str);
33
34 mbstate mbs; 34 mbstate mbs;
35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
36 36
37 char *dst = r; 37 char *dst = r;
38 while (len--) 38 while (len--)
39 { 39 {
40 int l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
41 if (l < 0) 42 if (l < 0)
42 *dst++ = '?'; 43 *dst++ = '?';
43 else 44 else
44 dst += l; 45 dst += l;
45 } 46 }
46 47
47 *dst++ = 0; 48 *dst++ = 0;
48 49
50 return (char *)rxvt_realloc (r, dst - r);
51}
52
53wchar_t *
54rxvt_mbstowcs (const char *str, int len)
55{
56 if (len < 0) len = strlen (str);
57
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59
60 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0;
62
49 return r; 63 return r;
50} 64}
51 65
52/* EXTPROTO */ 66char *
67rxvt_wcstoutf8 (const wchar_t *str, int len)
68{
69 if (len < 0) len = wcslen (str);
70
71 char *r = (char *)rxvt_malloc (len * 4 + 1);
72 char *p = r;
73
74 while (len--)
75 {
76 unicode_t w = *str++ & UNICODE_MASK;
77
78 if (w < 0x000080)
79 *p++ = w;
80 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ),
85 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f),
90 *p++ = 0x80 | ((w >> 6) & 0x3f),
91 *p++ = 0x80 | ( w & 0x3f);
92 else
93 *p++ = '?';
94 }
95
96 *p++ = 0;
97
98 return (char *)rxvt_realloc (r, p - r);
99}
100
101wchar_t *
102rxvt_utf8towcs (const char *str, int len)
103{
104 if (len < 0) len = strlen (str);
105
106 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)),
107 *p = r;
108
109 unsigned char *s = (unsigned char *)str,
110 *e = s + len;
111
112 for (;;)
113 {
114 len = e - s;
115
116 if (len == 0)
117 break;
118 else if (s[0] < 0x80)
119 *p++ = *s++;
120 else if (len >= 2
121 && s[0] >= 0xc2 && s[0] <= 0xdf
122 && (s[1] & 0xc0) == 0x80)
123 {
124 *p++ = ((s[0] & 0x1f) << 6)
125 | (s[1] & 0x3f);
126 s += 2;
127 }
128 else if (len >= 3
129 && ( (s[0] == 0xe0 && s[1] >= 0xa0 && s[1] <= 0xbf)
130 || (s[0] >= 0xe1 && s[0] <= 0xec && s[1] >= 0x80 && s[1] <= 0xbf)
131 || (s[0] == 0xed && s[1] >= 0x80 && s[1] <= 0x9f)
132 || (s[0] >= 0xee && s[0] <= 0xef && s[1] >= 0x80 && s[1] <= 0xbf)
133 )
134 && (s[2] & 0xc0) == 0x80)
135 {
136 *p++ = ((s[0] & 0x0f) << 12)
137 | ((s[1] & 0x3f) << 6)
138 | (s[2] & 0x3f);
139 s += 3;
140 }
141 else if (len >= 4
142 && ( (s[0] == 0xf0 && s[1] >= 0x90 && s[1] <= 0xbf)
143 || (s[0] >= 0xf1 && s[0] <= 0xf3 && s[1] >= 0x80 && s[1] <= 0xbf)
144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
145 )
146 && (s[2] & 0xc0) == 0x80
147 && (s[3] & 0xc0) == 0x80)
148 {
149 *p++ = ((s[0] & 0x07) << 18)
150 | ((s[1] & 0x3f) << 12)
151 | ((s[2] & 0x3f) << 6)
152 | (s[3] & 0x3f);
153 s += 4;
154 }
155 else
156 {
157 *p++ = 0xfffd;
158 s++;
159 }
160 }
161
162 *p = 0;
163
164 return r;
165}
166
53char * 167char *
54rxvt_strdup (const char *str) 168rxvt_strdup (const char *str)
55{ 169{
56 return str ? strdup (str) : 0; 170 return str ? strdup (str) : 0;
57} 171}
58 172
59/* EXTPROTO */
60char * 173char *
61rxvt_r_basename (const char *str) 174rxvt_r_basename (const char *str)
62{ 175{
63 char *base = STRRCHR (str, '/'); 176 char *base = strrchr (str, '/');
64 177
65 return (char *) (base ? base + 1 : str); 178 return (char *) (base ? base + 1 : str);
66} 179}
67 180
68/* 181/*
69 * Print an error message 182 * Print an error message
70 */ 183 */
71/* EXTPROTO */
72void 184void
73rxvt_vlog (const char *fmt, va_list arg_ptr) 185rxvt_vlog (const char *fmt, va_list arg_ptr)
74{ 186{
75 char msg[1024]; 187 char msg[1024];
76 188
… …
80 (*GET_R->log_hook) (msg); 192 (*GET_R->log_hook) (msg);
81 else 193 else
82 write (STDOUT_FILENO, msg, strlen (msg)); 194 write (STDOUT_FILENO, msg, strlen (msg));
83} 195}
84 196
85/* EXTPROTO */
86void 197void
87rxvt_log (const char *fmt,...) 198rxvt_log (const char *fmt,...)
88{ 199{
89 va_list arg_ptr; 200 va_list arg_ptr;
90 201
… …
94} 205}
95 206
96/* 207/*
97 * Print an error message 208 * Print an error message
98 */ 209 */
99/* EXTPROTO */
100void 210void
101rxvt_warn (const char *fmt,...) 211rxvt_warn (const char *fmt,...)
102{ 212{
103 va_list arg_ptr; 213 va_list arg_ptr;
104 214
… …
107 va_start (arg_ptr, fmt); 217 va_start (arg_ptr, fmt);
108 rxvt_vlog (fmt, arg_ptr); 218 rxvt_vlog (fmt, arg_ptr);
109 va_end (arg_ptr); 219 va_end (arg_ptr);
110} 220}
111 221
112/* EXTPROTO */
113void 222void
114rxvt_fatal (const char *fmt,...) 223rxvt_fatal (const char *fmt,...)
115{ 224{
116 va_list arg_ptr; 225 va_list arg_ptr;
117 226
… …
124 rxvt_exit_failure (); 233 rxvt_exit_failure ();
125} 234}
126 235
127class rxvt_failure_exception rxvt_failure_exception; 236class rxvt_failure_exception rxvt_failure_exception;
128 237
129/* EXTPROTO */
130void 238void
131rxvt_exit_failure () 239rxvt_exit_failure ()
132{ 240{
133 throw (rxvt_failure_exception); 241 throw (rxvt_failure_exception);
134} 242}
… …
137 * check that the first characters of S1 match S2 245 * check that the first characters of S1 match S2
138 * 246 *
139 * No Match 247 * No Match
140 * return: 0 248 * return: 0
141 * Match 249 * Match
142 * return: STRLEN (S2) 250 * return: strlen (S2)
143 */ 251 */
144/* EXTPROTO */
145int 252int
146rxvt_Str_match (const char *s1, const char *s2) 253rxvt_Str_match (const char *s1, const char *s2)
147{ 254{
148 int n = STRLEN (s2); 255 int n = strlen (s2);
149 256
150 return ((STRNCMP (s1, s2, n) == 0) ? n : 0); 257 return ((strncmp (s1, s2, n) == 0) ? n : 0);
151} 258}
152 259
153/* EXTPROTO */
154const char * 260const char *
155rxvt_Str_skip_space (const char *str) 261rxvt_Str_skip_space (const char *str)
156{ 262{
157 if (str) 263 if (str)
158 while (*str && isspace (*str)) 264 while (*str && isspace (*str))
… …
163 269
164/* 270/*
165 * remove leading/trailing space and strip-off leading/trailing quotes. 271 * remove leading/trailing space and strip-off leading/trailing quotes.
166 * in place. 272 * in place.
167 */ 273 */
168/* EXTPROTO */
169char * 274char *
170rxvt_Str_trim (char *str) 275rxvt_Str_trim (char *str)
171{ 276{
172 char *r, *s; 277 char *r, *s;
173 int n;
174 278
175 if (!str || !*str) /* shortcut */ 279 if (!str || !*str) /* shortcut */
176 return str; 280 return str;
177 281
178 /* skip leading spaces */ 282 /* skip leading spaces */
179 for (s = str; *s && isspace (*s); s++) ; 283 for (s = str; *s && isspace (*s); s++) ;
284
180 /* goto end of string */ 285 /* goto end of string */
181 for (n = 0, r = s; *r++; n++) ; 286 r = s + strlen (s) - 1;
182 r -= 2; 287
183 /* dump return */ 288 /* dump return and other trailing whitespace */
184 if (n > 0 && *r == '\n') 289 while (r > s && isspace (*r))
185 n--, r--; 290 r--;
186 /* backtrack along trailing spaces */ 291
187 for (; n > 0 && isspace (*r); r--, n--) ; 292#if 0
188 /* skip matching leading/trailing quotes */ 293 /* skip matching leading/trailing quotes */
189 if (*s == '"' && *r == '"' && n > 1) 294 if (*s == '"' && *r == '"' && n > 1)
190 { 295 {
191 s++; 296 s++;
192 n -= 2; 297 n -= 2;
193 } 298 }
299#endif
194 300
195 /* copy back over: forwards copy */ 301 memmove (str, s, r + 1 - s);
196 for (r = str; n; n--) 302 str[r + 1 - s] = 0;
197 *r++ = *s++;
198 *r = '\0';
199 303
200 return str; 304 return str;
201} 305}
202 306
203/* 307/*
… …
212 * "M-x" prefixed strings, append "\r" if needed 316 * "M-x" prefixed strings, append "\r" if needed
213 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed 317 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
214 * 318 *
215 * returns the converted string length 319 * returns the converted string length
216 */ 320 */
217/* EXTPROTO */
218int 321int
219rxvt_Str_escaped (char *str) 322rxvt_Str_escaped (char *str)
220{ 323{
221 char ch, *s, *d; 324 char ch, *s, *d;
222 int i, num, append = 0; 325 int i, num, append = 0;
… …
286 return (d - str); 389 return (d - str);
287} 390}
288 391
289/* 392/*
290 * Split a comma-separated string into an array, stripping leading and 393 * Split a comma-separated string into an array, stripping leading and
291 * trailing spaces (and paired quotes) from each entry. Empty strings 394 * trailing spaces from each entry. Empty strings are properly returned
292 * are properly returned
293 * Caller should free each entry and array when done 395 * Caller should free each entry and array when done
294 */ 396 */
295/* EXTPROTO */
296char ** 397char **
297rxvt_splitcommastring (const char *cs) 398rxvt_splitcommastring (const char *cs)
298{ 399{
299 int l, n, p; 400 int l, n, p;
300 const char *s, *t; 401 const char *s, *t;
… …
304 s = ""; 405 s = "";
305 406
306 for (n = 1, t = s; *t; t++) 407 for (n = 1, t = s; *t; t++)
307 if (*t == ',') 408 if (*t == ',')
308 n++; 409 n++;
410
309 ret = (char **)malloc ((n + 1) * sizeof (char *)); 411 ret = (char **)malloc ((n + 1) * sizeof (char *));
310 ret[n] = NULL; 412 ret[n] = NULL;
311 413
312 for (l = 0, t = s; l < n; l++) 414 for (l = 0, t = s; l < n; l++)
313 { 415 {
… …
317 strncpy (ret[l], s, p); 419 strncpy (ret[l], s, p);
318 ret[l][p] = '\0'; 420 ret[l][p] = '\0';
319 rxvt_Str_trim (ret[l]); 421 rxvt_Str_trim (ret[l]);
320 s = ++t; 422 s = ++t;
321 } 423 }
424
322 return ret; 425 return ret;
426}
427
428void
429rxvt_freecommastring (char **cs)
430{
431 for (int i = 0; cs[i]; ++i)
432 free (cs[i]);
433
434 free (cs);
323} 435}
324 436
325/*----------------------------------------------------------------------* 437/*----------------------------------------------------------------------*
326 * file searching 438 * file searching
327 */ 439 */
328 440
329/* #define DEBUG_SEARCH_PATH */ 441/* #define DEBUG_SEARCH_PATH */
330 442
331#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 443#ifdef XPM_BACKGROUND
332/* 444/*
333 * search for FILE in the current working directory, and within the 445 * search for FILE in the current working directory, and within the
334 * colon-delimited PATHLIST, adding the file extension EXT if required. 446 * colon-delimited PATHLIST, adding the file extension EXT if required.
335 * 447 *
336 * FILE is either semi-colon or zero terminated 448 * FILE is either semi-colon or zero terminated
337 */ 449 */
338/* INTPROTO */
339char * 450char *
340rxvt_File_search_path (const char *pathlist, const char *file, const char *ext) 451rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
341{ 452{
342 int maxpath, len; 453 int maxpath, len;
343 const char *p, *path; 454 const char *p, *path;
344 char name[256]; 455 char name[256];
345 456
346 if (!access (file, R_OK)) /* found (plain name) in current directory */ 457 if (!access (file, R_OK)) /* found (plain name) in current directory */
347 return STRDUP (file); 458 return strdup (file);
348 459
349 /* semi-colon delimited */ 460 /* semi-colon delimited */
350 if ((p = STRCHR (file, ';'))) 461 if ((p = strchr (file, ';')))
351 len = (p - file); 462 len = (p - file);
352 else 463 else
353 len = STRLEN (file); 464 len = strlen (file);
354 465
355#ifdef DEBUG_SEARCH_PATH 466#ifdef DEBUG_SEARCH_PATH
356 getcwd (name, sizeof (name)); 467 getcwd (name, sizeof (name));
357 fprintf (stderr, "pwd: \"%s\"\n", name); 468 fprintf (stderr, "pwd: \"%s\"\n", name);
358 fprintf (stderr, "find: \"%.*s\"\n", len, file); 469 fprintf (stderr, "find: \"%.*s\"\n", len, file);
359#endif 470#endif
360 471
361 /* leave room for an extra '/' and trailing '\0' */ 472 /* leave room for an extra '/' and trailing '\0' */
362 maxpath = sizeof (name) - (len + (ext ? STRLEN (ext) : 0) + 2); 473 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
363 if (maxpath <= 0) 474 if (maxpath <= 0)
364 return NULL; 475 return NULL;
365 476
366 /* check if we can find it now */ 477 /* check if we can find it now */
367 STRNCPY (name, file, len); 478 strncpy (name, file, len);
368 name[len] = '\0'; 479 name[len] = '\0';
369 480
370 if (!access (name, R_OK)) 481 if (!access (name, R_OK))
371 return STRDUP (name); 482 return strdup (name);
372 if (ext) 483 if (ext)
373 { 484 {
374 STRCAT (name, ext); 485 strcat (name, ext);
375 if (!access (name, R_OK)) 486 if (!access (name, R_OK))
376 return STRDUP (name); 487 return strdup (name);
377 } 488 }
378 for (path = pathlist; path != NULL && *path != '\0'; path = p) 489 for (path = pathlist; path != NULL && *path != '\0'; path = p)
379 { 490 {
380 int n; 491 int n;
381 492
382 /* colon delimited */ 493 /* colon delimited */
383 if ((p = STRCHR (path, ':')) == NULL) 494 if ((p = strchr (path, ':')) == NULL)
384 p = STRCHR (path, '\0'); 495 p = strchr (path, '\0');
385 496
386 n = (p - path); 497 n = (p - path);
387 if (*p != '\0') 498 if (*p != '\0')
388 p++; 499 p++;
389 500
390 if (n > 0 && n <= maxpath) 501 if (n > 0 && n <= maxpath)
391 { 502 {
392 STRNCPY (name, path, n); 503 strncpy (name, path, n);
393 if (name[n - 1] != '/') 504 if (name[n - 1] != '/')
394 name[n++] = '/'; 505 name[n++] = '/';
395 name[n] = '\0'; 506 name[n] = '\0';
396 STRNCAT (name, file, len); 507 strncat (name, file, len);
397 508
398 if (!access (name, R_OK)) 509 if (!access (name, R_OK))
399 return STRDUP (name); 510 return strdup (name);
400 if (ext) 511 if (ext)
401 { 512 {
402 STRCAT (name, ext); 513 strcat (name, ext);
403 if (!access (name, R_OK)) 514 if (!access (name, R_OK))
404 return STRDUP (name); 515 return strdup (name);
405 } 516 }
406 } 517 }
407 } 518 }
408 return NULL; 519 return NULL;
409} 520}
410 521
411/* EXTPROTO */
412char * 522char *
413rxvt_File_find (const char *file, const char *ext, const char *path) 523rxvt_File_find (const char *file, const char *ext, const char *path)
414{ 524{
415 char *f; 525 char *f;
416 526
417 if (file == NULL || *file == '\0') 527 if (file == NULL || *file == '\0')
418 return NULL; 528 return NULL;
419 529
420 /* search environment variables here too */
421 if ((f = rxvt_File_search_path (path, file, ext)) == NULL) 530 f = rxvt_File_search_path (path, file, ext);
422#ifdef PATH_ENV
423 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
424#endif
425 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
426 531
427#ifdef DEBUG_SEARCH_PATH 532#ifdef DEBUG_SEARCH_PATH
428 if (f) 533 if (f)
429 fprintf (stderr, "found: \"%s\"\n", f); 534 fprintf (stderr, "found: \"%s\"\n", f);
430#endif 535#endif
431 536
432 return f; 537 return f;
433} 538}
434#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */ 539#endif
435 540
436/*----------------------------------------------------------------------* 541/*----------------------------------------------------------------------*
437 * miscellaneous drawing routines 542 * miscellaneous drawing routines
438 */ 543 */
439 544
440/* 545/*
441 * Draw top/left and bottom/right border shadows around windows 546 * Draw top/left and bottom/right border shadows around windows
442 */ 547 */
443#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) 548#ifdef RXVT_SCROLLBAR
444/* EXTPROTO */
445void 549void
446rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 550rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h)
447{ 551{
448 int shadow; 552 int shadow;
449 553
450 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 554 shadow = (w == 0 || h == 0) ? 1 : 2;
451 w += x - 1; 555 w += x - 1;
452 h += y - 1; 556 h += y - 1;
453 for (; shadow-- > 0; x++, y++, w--, h--) 557 for (; shadow-- > 0; x++, y++, w--, h--)
454 { 558 {
455 XDrawLine (display, win, topShadow, x, y, w, y); 559 XDrawLine (display, win, topShadow, x, y, w, y);
… …
458 XDrawLine (display, win, botShadow, w, h, x + 1, h); 562 XDrawLine (display, win, botShadow, w, h, x + 1, h);
459 } 563 }
460} 564}
461#endif 565#endif
462 566
463/* button shapes */ 567// should not be used in interactive programs, for obvious reasons
464#ifdef MENUBAR 568void rxvt_usleep (int usecs)
465/* EXTPROTO */
466void
467rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type)
468{ 569{
469 switch (type) 570#if HAVE_NANOSLEEP
470 { 571 struct timespec ts;
471 case 'r': /* right triangle */
472 XDrawLine (display, win, topShadow, x, y, x, y + w);
473 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
474 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
475 break;
476 572
477 case 'l': /* left triangle */ 573 ts.tv_sec = 0;
478 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y); 574 ts.tv_nsec = usecs * 1000;
479 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2); 575 nanosleep (&ts, NULL);
480 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y); 576#else
481 break; 577 /* use select for timing */
578 struct timeval tv;
482 579
483 case 'd': /* down triangle */ 580 tv.tv_sec = 0;
484 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w); 581 tv.tv_usec = usecs;
485 XDrawLine (display, win, topShadow, x, y, x + w, y); 582 select (0, NULL, NULL, NULL, &tv);
486 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w); 583#endif
487 break;
488
489 case 'u': /* up triangle */
490 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
491 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
492 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
493 break;
494#if 0
495 case 's': /* square */
496 XDrawLine (display, win, topShadow, x + w, y, x, y);
497 XDrawLine (display, win, topShadow, x, y, x, y + w);
498 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
499 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
500 break;
501#endif
502
503 }
504} 584}
505#endif 585
506/*----------------------- end-of-file (C source) -----------------------*/ 586/*----------------------- end-of-file (C source) -----------------------*/
587

Diff Legend

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