Annotation of src/usr.bin/mandoc/mandoc.c, Revision 1.60
1.60 ! schwarze 1: /* $OpenBSD: mandoc.c,v 1.59 2015/01/21 20:20:49 schwarze Exp $ */
1.1 schwarze 2: /*
1.58 schwarze 3: * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
4: * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
1.1 schwarze 5: *
6: * Permission to use, copy, modify, and distribute this software for any
7: * purpose with or without fee is hereby granted, provided that the above
8: * copyright notice and this permission notice appear in all copies.
9: *
1.21 schwarze 10: * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
1.1 schwarze 11: * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
1.21 schwarze 12: * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
1.1 schwarze 13: * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14: * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15: * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16: * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17: */
1.2 schwarze 18: #include <sys/types.h>
19:
1.1 schwarze 20: #include <assert.h>
21: #include <ctype.h>
1.26 schwarze 22: #include <errno.h>
23: #include <limits.h>
1.1 schwarze 24: #include <stdlib.h>
1.4 schwarze 25: #include <stdio.h>
26: #include <string.h>
1.5 schwarze 27: #include <time.h>
1.1 schwarze 28:
1.14 schwarze 29: #include "mandoc.h"
1.45 schwarze 30: #include "mandoc_aux.h"
1.1 schwarze 31: #include "libmandoc.h"
32:
1.22 schwarze 33: #define DATESIZE 32
34:
1.14 schwarze 35: static int a2time(time_t *, const char *, const char *);
1.22 schwarze 36: static char *time2a(time_t);
1.5 schwarze 37:
1.26 schwarze 38:
39: enum mandoc_esc
1.44 schwarze 40: mandoc_escape(const char **end, const char **start, int *sz)
1.26 schwarze 41: {
1.34 schwarze 42: const char *local_start;
43: int local_sz;
44: char term;
1.48 schwarze 45: enum mandoc_esc gly;
1.26 schwarze 46:
1.34 schwarze 47: /*
48: * When the caller doesn't provide return storage,
49: * use local storage.
50: */
51:
52: if (NULL == start)
53: start = &local_start;
54: if (NULL == sz)
55: sz = &local_sz;
56:
57: /*
58: * Beyond the backslash, at least one input character
59: * is part of the escape sequence. With one exception
60: * (see below), that character won't be returned.
61: */
62:
1.26 schwarze 63: gly = ESCAPE_ERROR;
1.34 schwarze 64: *start = ++*end;
65: *sz = 0;
1.33 schwarze 66: term = '\0';
1.26 schwarze 67:
1.34 schwarze 68: switch ((*start)[-1]) {
1.26 schwarze 69: /*
70: * First the glyphs. There are several different forms of
71: * these, but each eventually returns a substring of the glyph
72: * name.
73: */
1.48 schwarze 74: case '(':
1.26 schwarze 75: gly = ESCAPE_SPECIAL;
1.34 schwarze 76: *sz = 2;
1.26 schwarze 77: break;
1.48 schwarze 78: case '[':
1.26 schwarze 79: gly = ESCAPE_SPECIAL;
80: term = ']';
81: break;
1.48 schwarze 82: case 'C':
1.34 schwarze 83: if ('\'' != **start)
1.26 schwarze 84: return(ESCAPE_ERROR);
1.34 schwarze 85: *start = ++*end;
1.54 schwarze 86: gly = ESCAPE_SPECIAL;
1.26 schwarze 87: term = '\'';
88: break;
1.41 schwarze 89:
90: /*
91: * Escapes taking no arguments at all.
92: */
1.48 schwarze 93: case 'd':
1.41 schwarze 94: /* FALLTHROUGH */
1.48 schwarze 95: case 'u':
1.41 schwarze 96: return(ESCAPE_IGNORE);
1.32 schwarze 97:
98: /*
99: * The \z escape is supposed to output the following
1.48 schwarze 100: * character without advancing the cursor position.
1.32 schwarze 101: * Since we are mostly dealing with terminal mode,
102: * let us just skip the next character.
103: */
1.48 schwarze 104: case 'z':
1.32 schwarze 105: return(ESCAPE_SKIPCHAR);
1.1 schwarze 106:
1.26 schwarze 107: /*
108: * Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where
109: * 'X' is the trigger. These have opaque sub-strings.
110: */
1.48 schwarze 111: case 'F':
1.16 schwarze 112: /* FALLTHROUGH */
1.48 schwarze 113: case 'g':
1.16 schwarze 114: /* FALLTHROUGH */
1.48 schwarze 115: case 'k':
1.1 schwarze 116: /* FALLTHROUGH */
1.48 schwarze 117: case 'M':
1.14 schwarze 118: /* FALLTHROUGH */
1.48 schwarze 119: case 'm':
1.1 schwarze 120: /* FALLTHROUGH */
1.48 schwarze 121: case 'n':
1.1 schwarze 122: /* FALLTHROUGH */
1.48 schwarze 123: case 'V':
1.1 schwarze 124: /* FALLTHROUGH */
1.48 schwarze 125: case 'Y':
1.29 schwarze 126: gly = ESCAPE_IGNORE;
1.1 schwarze 127: /* FALLTHROUGH */
1.48 schwarze 128: case 'f':
1.26 schwarze 129: if (ESCAPE_ERROR == gly)
130: gly = ESCAPE_FONT;
1.34 schwarze 131: switch (**start) {
1.48 schwarze 132: case '(':
1.34 schwarze 133: *start = ++*end;
134: *sz = 2;
1.26 schwarze 135: break;
1.48 schwarze 136: case '[':
1.34 schwarze 137: *start = ++*end;
1.26 schwarze 138: term = ']';
139: break;
140: default:
1.34 schwarze 141: *sz = 1;
1.26 schwarze 142: break;
143: }
144: break;
145:
146: /*
147: * These escapes are of the form \X'Y', where 'X' is the trigger
148: * and 'Y' is any string. These have opaque sub-strings.
1.47 schwarze 149: * The \B and \w escapes are handled in roff.c, roff_res().
1.26 schwarze 150: */
1.48 schwarze 151: case 'A':
1.13 schwarze 152: /* FALLTHROUGH */
1.48 schwarze 153: case 'b':
1.1 schwarze 154: /* FALLTHROUGH */
1.48 schwarze 155: case 'D':
1.1 schwarze 156: /* FALLTHROUGH */
1.48 schwarze 157: case 'R':
1.42 schwarze 158: /* FALLTHROUGH */
1.48 schwarze 159: case 'X':
1.1 schwarze 160: /* FALLTHROUGH */
1.48 schwarze 161: case 'Z':
1.59 schwarze 162: gly = ESCAPE_IGNORE;
163: /* FALLTHROUGH */
164: case 'o':
165: if (**start == '\0')
1.26 schwarze 166: return(ESCAPE_ERROR);
1.59 schwarze 167: if (gly == ESCAPE_ERROR)
168: gly = ESCAPE_OVERSTRIKE;
1.46 schwarze 169: term = **start;
1.34 schwarze 170: *start = ++*end;
1.16 schwarze 171: break;
1.26 schwarze 172:
173: /*
174: * These escapes are of the form \X'N', where 'X' is the trigger
175: * and 'N' resolves to a numerical expression.
176: */
1.48 schwarze 177: case 'h':
1.17 schwarze 178: /* FALLTHROUGH */
1.48 schwarze 179: case 'H':
1.26 schwarze 180: /* FALLTHROUGH */
1.48 schwarze 181: case 'L':
1.26 schwarze 182: /* FALLTHROUGH */
1.48 schwarze 183: case 'l':
1.26 schwarze 184: /* FALLTHROUGH */
1.48 schwarze 185: case 'S':
1.26 schwarze 186: /* FALLTHROUGH */
1.48 schwarze 187: case 'v':
1.17 schwarze 188: /* FALLTHROUGH */
1.48 schwarze 189: case 'x':
1.51 schwarze 190: if (strchr(" %&()*+-./0123456789:<=>", **start)) {
1.53 schwarze 191: if ('\0' != **start)
192: ++*end;
1.34 schwarze 193: return(ESCAPE_ERROR);
1.51 schwarze 194: }
1.42 schwarze 195: gly = ESCAPE_IGNORE;
1.46 schwarze 196: term = **start;
1.34 schwarze 197: *start = ++*end;
1.26 schwarze 198: break;
1.29 schwarze 199:
200: /*
201: * Special handling for the numbered character escape.
202: * XXX Do any other escapes need similar handling?
203: */
1.48 schwarze 204: case 'N':
1.34 schwarze 205: if ('\0' == **start)
1.29 schwarze 206: return(ESCAPE_ERROR);
1.34 schwarze 207: (*end)++;
208: if (isdigit((unsigned char)**start)) {
209: *sz = 1;
1.29 schwarze 210: return(ESCAPE_IGNORE);
1.34 schwarze 211: }
212: (*start)++;
1.29 schwarze 213: while (isdigit((unsigned char)**end))
214: (*end)++;
1.34 schwarze 215: *sz = *end - *start;
1.29 schwarze 216: if ('\0' != **end)
217: (*end)++;
218: return(ESCAPE_NUMBERED);
1.26 schwarze 219:
1.48 schwarze 220: /*
1.26 schwarze 221: * Sizes get a special category of their own.
222: */
1.48 schwarze 223: case 's':
1.26 schwarze 224: gly = ESCAPE_IGNORE;
1.17 schwarze 225:
1.26 schwarze 226: /* See +/- counts as a sign. */
1.34 schwarze 227: if ('+' == **end || '-' == **end || ASCII_HYPH == **end)
1.58 schwarze 228: *start = ++*end;
1.6 schwarze 229:
1.34 schwarze 230: switch (**end) {
1.48 schwarze 231: case '(':
1.34 schwarze 232: *start = ++*end;
233: *sz = 2;
1.16 schwarze 234: break;
1.48 schwarze 235: case '[':
1.34 schwarze 236: *start = ++*end;
1.33 schwarze 237: term = ']';
1.16 schwarze 238: break;
1.48 schwarze 239: case '\'':
1.34 schwarze 240: *start = ++*end;
1.33 schwarze 241: term = '\'';
1.60 ! schwarze 242: break;
! 243: case '3':
! 244: /* FALLTHROUGH */
! 245: case '2':
! 246: /* FALLTHROUGH */
! 247: case '1':
! 248: *sz = (*end)[-1] == 's' &&
! 249: isdigit((unsigned char)(*end)[1]) ? 2 : 1;
1.16 schwarze 250: break;
251: default:
1.34 schwarze 252: *sz = 1;
1.16 schwarze 253: break;
1.6 schwarze 254: }
255:
1.26 schwarze 256: break;
257:
258: /*
259: * Anything else is assumed to be a glyph.
1.34 schwarze 260: * In this case, pass back the character after the backslash.
1.26 schwarze 261: */
262: default:
263: gly = ESCAPE_SPECIAL;
1.34 schwarze 264: *start = --*end;
265: *sz = 1;
1.26 schwarze 266: break;
267: }
268:
269: assert(ESCAPE_ERROR != gly);
270:
271: /*
1.33 schwarze 272: * Read up to the terminating character,
273: * paying attention to nested escapes.
1.26 schwarze 274: */
275:
276: if ('\0' != term) {
1.33 schwarze 277: while (**end != term) {
278: switch (**end) {
1.48 schwarze 279: case '\0':
1.33 schwarze 280: return(ESCAPE_ERROR);
1.48 schwarze 281: case '\\':
1.33 schwarze 282: (*end)++;
283: if (ESCAPE_ERROR ==
284: mandoc_escape(end, NULL, NULL))
285: return(ESCAPE_ERROR);
286: break;
287: default:
288: (*end)++;
289: break;
290: }
291: }
1.34 schwarze 292: *sz = (*end)++ - *start;
1.33 schwarze 293: } else {
1.34 schwarze 294: assert(*sz > 0);
295: if ((size_t)*sz > strlen(*start))
1.26 schwarze 296: return(ESCAPE_ERROR);
1.34 schwarze 297: *end += *sz;
1.26 schwarze 298: }
1.19 schwarze 299:
1.26 schwarze 300: /* Run post-processors. */
1.19 schwarze 301:
1.26 schwarze 302: switch (gly) {
1.48 schwarze 303: case ESCAPE_FONT:
1.37 schwarze 304: if (2 == *sz) {
305: if ('C' == **start) {
306: /*
307: * Treat constant-width font modes
308: * just like regular font modes.
309: */
310: (*start)++;
311: (*sz)--;
312: } else {
313: if ('B' == (*start)[0] && 'I' == (*start)[1])
314: gly = ESCAPE_FONTBI;
315: break;
316: }
1.34 schwarze 317: } else if (1 != *sz)
1.26 schwarze 318: break;
1.30 schwarze 319:
1.34 schwarze 320: switch (**start) {
1.48 schwarze 321: case '3':
1.26 schwarze 322: /* FALLTHROUGH */
1.48 schwarze 323: case 'B':
1.26 schwarze 324: gly = ESCAPE_FONTBOLD;
325: break;
1.48 schwarze 326: case '2':
1.26 schwarze 327: /* FALLTHROUGH */
1.48 schwarze 328: case 'I':
1.26 schwarze 329: gly = ESCAPE_FONTITALIC;
1.16 schwarze 330: break;
1.48 schwarze 331: case 'P':
1.26 schwarze 332: gly = ESCAPE_FONTPREV;
1.16 schwarze 333: break;
1.48 schwarze 334: case '1':
1.26 schwarze 335: /* FALLTHROUGH */
1.48 schwarze 336: case 'R':
1.26 schwarze 337: gly = ESCAPE_FONTROMAN;
1.1 schwarze 338: break;
339: }
1.16 schwarze 340: break;
1.48 schwarze 341: case ESCAPE_SPECIAL:
1.34 schwarze 342: if (1 == *sz && 'c' == **start)
1.26 schwarze 343: gly = ESCAPE_NOSPACE;
1.54 schwarze 344: /*
1.55 schwarze 345: * Unicode escapes are defined in groff as \[u0000]
1.54 schwarze 346: * to \[u10FFFF], where the contained value must be
347: * a valid Unicode codepoint. Here, however, only
1.55 schwarze 348: * check the length and range.
1.54 schwarze 349: */
1.55 schwarze 350: if (**start != 'u' || *sz < 5 || *sz > 7)
351: break;
352: if (*sz == 7 && ((*start)[1] != '1' || (*start)[2] != '0'))
353: break;
354: if (*sz == 6 && (*start)[1] == '0')
355: break;
356: if ((int)strspn(*start + 1, "0123456789ABCDEFabcdef")
1.54 schwarze 357: + 1 == *sz)
358: gly = ESCAPE_UNICODE;
1.16 schwarze 359: break;
1.1 schwarze 360: default:
1.16 schwarze 361: break;
1.1 schwarze 362: }
363:
1.26 schwarze 364: return(gly);
1.21 schwarze 365: }
366:
367: /*
368: * Parse a quoted or unquoted roff-style request or macro argument.
369: * Return a pointer to the parsed argument, which is either the original
370: * pointer or advanced by one byte in case the argument is quoted.
1.40 schwarze 371: * NUL-terminate the argument in place.
1.21 schwarze 372: * Collapse pairs of quotes inside quoted arguments.
373: * Advance the argument pointer to the next argument,
1.40 schwarze 374: * or to the NUL byte terminating the argument line.
1.21 schwarze 375: */
376: char *
1.25 schwarze 377: mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos)
1.21 schwarze 378: {
379: char *start, *cp;
380: int quoted, pairs, white;
381:
382: /* Quoting can only start with a new word. */
383: start = *cpp;
1.26 schwarze 384: quoted = 0;
1.21 schwarze 385: if ('"' == *start) {
386: quoted = 1;
387: start++;
1.48 schwarze 388: }
1.21 schwarze 389:
390: pairs = 0;
391: white = 0;
392: for (cp = start; '\0' != *cp; cp++) {
1.36 schwarze 393:
394: /*
395: * Move the following text left
396: * after quoted quotes and after "\\" and "\t".
397: */
1.21 schwarze 398: if (pairs)
399: cp[-pairs] = cp[0];
1.36 schwarze 400:
1.21 schwarze 401: if ('\\' == cp[0]) {
1.36 schwarze 402: /*
403: * In copy mode, translate double to single
404: * backslashes and backslash-t to literal tabs.
405: */
406: switch (cp[1]) {
1.48 schwarze 407: case 't':
1.36 schwarze 408: cp[0] = '\t';
409: /* FALLTHROUGH */
1.48 schwarze 410: case '\\':
1.21 schwarze 411: pairs++;
412: cp++;
1.36 schwarze 413: break;
1.48 schwarze 414: case ' ':
1.21 schwarze 415: /* Skip escaped blanks. */
1.36 schwarze 416: if (0 == quoted)
417: cp++;
418: break;
419: default:
420: break;
421: }
1.21 schwarze 422: } else if (0 == quoted) {
423: if (' ' == cp[0]) {
424: /* Unescaped blanks end unquoted args. */
425: white = 1;
426: break;
427: }
428: } else if ('"' == cp[0]) {
429: if ('"' == cp[1]) {
430: /* Quoted quotes collapse. */
431: pairs++;
432: cp++;
433: } else {
434: /* Unquoted quotes end quoted args. */
435: quoted = 2;
436: break;
437: }
438: }
439: }
440:
441: /* Quoted argument without a closing quote. */
1.25 schwarze 442: if (1 == quoted)
1.52 schwarze 443: mandoc_msg(MANDOCERR_ARG_QUOTE, parse, ln, *pos, NULL);
1.21 schwarze 444:
1.40 schwarze 445: /* NUL-terminate this argument and move to the next one. */
1.21 schwarze 446: if (pairs)
447: cp[-pairs] = '\0';
448: if ('\0' != *cp) {
449: *cp++ = '\0';
450: while (' ' == *cp)
451: cp++;
452: }
1.24 schwarze 453: *pos += (int)(cp - start) + (quoted ? 1 : 0);
1.21 schwarze 454: *cpp = cp;
455:
1.25 schwarze 456: if ('\0' == *cp && (white || ' ' == cp[-1]))
1.52 schwarze 457: mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL);
1.21 schwarze 458:
459: return(start);
1.4 schwarze 460: }
1.5 schwarze 461:
462: static int
463: a2time(time_t *t, const char *fmt, const char *p)
464: {
465: struct tm tm;
466: char *pp;
467:
468: memset(&tm, 0, sizeof(struct tm));
469:
470: pp = strptime(p, fmt, &tm);
471: if (NULL != pp && '\0' == *pp) {
472: *t = mktime(&tm);
473: return(1);
474: }
475:
476: return(0);
477: }
478:
1.22 schwarze 479: static char *
480: time2a(time_t t)
481: {
1.28 schwarze 482: struct tm *tm;
1.23 schwarze 483: char *buf, *p;
484: size_t ssz;
1.22 schwarze 485: int isz;
486:
1.28 schwarze 487: tm = localtime(&t);
1.57 schwarze 488: if (tm == NULL)
489: return(NULL);
1.22 schwarze 490:
1.23 schwarze 491: /*
492: * Reserve space:
493: * up to 9 characters for the month (September) + blank
494: * up to 2 characters for the day + comma + blank
495: * 4 characters for the year and a terminating '\0'
496: */
497: p = buf = mandoc_malloc(10 + 4 + 4 + 1);
498:
1.28 schwarze 499: if (0 == (ssz = strftime(p, 10 + 1, "%B ", tm)))
1.23 schwarze 500: goto fail;
501: p += (int)ssz;
1.22 schwarze 502:
1.28 schwarze 503: if (-1 == (isz = snprintf(p, 4 + 1, "%d, ", tm->tm_mday)))
1.23 schwarze 504: goto fail;
1.22 schwarze 505: p += isz;
506:
1.28 schwarze 507: if (0 == strftime(p, 4 + 1, "%Y", tm))
1.23 schwarze 508: goto fail;
509: return(buf);
510:
511: fail:
512: free(buf);
513: return(NULL);
1.22 schwarze 514: }
515:
516: char *
1.25 schwarze 517: mandoc_normdate(struct mparse *parse, char *in, int ln, int pos)
1.5 schwarze 518: {
1.22 schwarze 519: char *out;
1.5 schwarze 520: time_t t;
521:
1.22 schwarze 522: if (NULL == in || '\0' == *in ||
523: 0 == strcmp(in, "$" "Mdocdate$")) {
1.49 schwarze 524: mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL);
1.22 schwarze 525: time(&t);
526: }
1.31 schwarze 527: else if (a2time(&t, "%Y-%m-%d", in))
528: t = 0;
1.22 schwarze 529: else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) &&
1.31 schwarze 530: !a2time(&t, "%b %d, %Y", in)) {
1.50 schwarze 531: mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in);
1.22 schwarze 532: t = 0;
1.5 schwarze 533: }
1.22 schwarze 534: out = t ? time2a(t) : NULL;
1.23 schwarze 535: return(out ? out : mandoc_strdup(in));
1.5 schwarze 536: }
537:
1.9 schwarze 538: int
1.43 schwarze 539: mandoc_eos(const char *p, size_t sz)
1.9 schwarze 540: {
1.43 schwarze 541: const char *q;
542: int enclosed, found;
1.9 schwarze 543:
1.10 schwarze 544: if (0 == sz)
545: return(0);
1.9 schwarze 546:
1.11 schwarze 547: /*
548: * End-of-sentence recognition must include situations where
549: * some symbols, such as `)', allow prior EOS punctuation to
1.26 schwarze 550: * propagate outward.
1.11 schwarze 551: */
552:
1.43 schwarze 553: enclosed = found = 0;
1.16 schwarze 554: for (q = p + (int)sz - 1; q >= p; q--) {
1.15 schwarze 555: switch (*q) {
1.48 schwarze 556: case '\"':
1.11 schwarze 557: /* FALLTHROUGH */
1.48 schwarze 558: case '\'':
1.11 schwarze 559: /* FALLTHROUGH */
1.48 schwarze 560: case ']':
1.11 schwarze 561: /* FALLTHROUGH */
1.48 schwarze 562: case ')':
1.15 schwarze 563: if (0 == found)
564: enclosed = 1;
1.11 schwarze 565: break;
1.48 schwarze 566: case '.':
1.11 schwarze 567: /* FALLTHROUGH */
1.48 schwarze 568: case '!':
1.11 schwarze 569: /* FALLTHROUGH */
1.48 schwarze 570: case '?':
1.15 schwarze 571: found = 1;
572: break;
1.11 schwarze 573: default:
1.20 schwarze 574: return(found && (!enclosed || isalnum((unsigned char)*q)));
1.11 schwarze 575: }
1.9 schwarze 576: }
577:
1.15 schwarze 578: return(found && !enclosed);
1.9 schwarze 579: }
1.26 schwarze 580:
581: /*
582: * Convert a string to a long that may not be <0.
583: * If the string is invalid, or is less than 0, return -1.
584: */
585: int
1.27 schwarze 586: mandoc_strntoi(const char *p, size_t sz, int base)
1.26 schwarze 587: {
588: char buf[32];
589: char *ep;
590: long v;
591:
592: if (sz > 31)
593: return(-1);
594:
595: memcpy(buf, p, sz);
596: buf[(int)sz] = '\0';
597:
598: errno = 0;
599: v = strtol(buf, &ep, base);
600:
601: if (buf[0] == '\0' || *ep != '\0')
602: return(-1);
603:
1.27 schwarze 604: if (v > INT_MAX)
605: v = INT_MAX;
606: if (v < INT_MIN)
607: v = INT_MIN;
1.26 schwarze 608:
609: return((int)v);
610: }