version 1.86, 2014/08/18 09:11:47 |
version 1.94, 2015/10/06 18:32:19 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 79 mandoc_escape(const char **end, const char **start, in |
|
Line 79 mandoc_escape(const char **end, const char **start, in |
|
break; |
break; |
case '[': |
case '[': |
gly = ESCAPE_SPECIAL; |
gly = ESCAPE_SPECIAL; |
/* |
|
* Unicode escapes are defined in groff as \[uXXXX] to |
|
* \[u10FFFF], where the contained value must be a valid |
|
* Unicode codepoint. Here, however, only check whether |
|
* it's not a zero-width escape. |
|
*/ |
|
if ('u' == (*start)[0] && ']' != (*start)[1]) |
|
gly = ESCAPE_UNICODE; |
|
term = ']'; |
term = ']'; |
break; |
break; |
case 'C': |
case 'C': |
if ('\'' != **start) |
if ('\'' != **start) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
*start = ++*end; |
*start = ++*end; |
if ('u' == (*start)[0] && '\'' != (*start)[1]) |
gly = ESCAPE_SPECIAL; |
gly = ESCAPE_UNICODE; |
|
else |
|
gly = ESCAPE_SPECIAL; |
|
term = '\''; |
term = '\''; |
break; |
break; |
|
|
Line 106 mandoc_escape(const char **end, const char **start, in |
|
Line 95 mandoc_escape(const char **end, const char **start, in |
|
case 'd': |
case 'd': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'u': |
case 'u': |
return(ESCAPE_IGNORE); |
/* FALLTHROUGH */ |
|
case ',': |
|
/* FALLTHROUGH */ |
|
case '/': |
|
return ESCAPE_IGNORE; |
|
|
/* |
/* |
* The \z escape is supposed to output the following |
* The \z escape is supposed to output the following |
Line 115 mandoc_escape(const char **end, const char **start, in |
|
Line 108 mandoc_escape(const char **end, const char **start, in |
|
* let us just skip the next character. |
* let us just skip the next character. |
*/ |
*/ |
case 'z': |
case 'z': |
return(ESCAPE_SKIPCHAR); |
return ESCAPE_SKIPCHAR; |
|
|
/* |
/* |
* Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where |
* Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where |
Line 167 mandoc_escape(const char **end, const char **start, in |
|
Line 160 mandoc_escape(const char **end, const char **start, in |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'D': |
case 'D': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'o': |
|
/* FALLTHROUGH */ |
|
case 'R': |
case 'R': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'X': |
case 'X': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'Z': |
case 'Z': |
if ('\0' == **start) |
|
return(ESCAPE_ERROR); |
|
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
|
/* FALLTHROUGH */ |
|
case 'o': |
|
if (**start == '\0') |
|
return ESCAPE_ERROR; |
|
if (gly == ESCAPE_ERROR) |
|
gly = ESCAPE_OVERSTRIKE; |
term = **start; |
term = **start; |
*start = ++*end; |
*start = ++*end; |
break; |
break; |
Line 201 mandoc_escape(const char **end, const char **start, in |
|
Line 196 mandoc_escape(const char **end, const char **start, in |
|
if (strchr(" %&()*+-./0123456789:<=>", **start)) { |
if (strchr(" %&()*+-./0123456789:<=>", **start)) { |
if ('\0' != **start) |
if ('\0' != **start) |
++*end; |
++*end; |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
} |
} |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
term = **start; |
term = **start; |
Line 214 mandoc_escape(const char **end, const char **start, in |
|
Line 209 mandoc_escape(const char **end, const char **start, in |
|
*/ |
*/ |
case 'N': |
case 'N': |
if ('\0' == **start) |
if ('\0' == **start) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
(*end)++; |
(*end)++; |
if (isdigit((unsigned char)**start)) { |
if (isdigit((unsigned char)**start)) { |
*sz = 1; |
*sz = 1; |
return(ESCAPE_IGNORE); |
return ESCAPE_IGNORE; |
} |
} |
(*start)++; |
(*start)++; |
while (isdigit((unsigned char)**end)) |
while (isdigit((unsigned char)**end)) |
Line 226 mandoc_escape(const char **end, const char **start, in |
|
Line 221 mandoc_escape(const char **end, const char **start, in |
|
*sz = *end - *start; |
*sz = *end - *start; |
if ('\0' != **end) |
if ('\0' != **end) |
(*end)++; |
(*end)++; |
return(ESCAPE_NUMBERED); |
return ESCAPE_NUMBERED; |
|
|
/* |
/* |
* Sizes get a special category of their own. |
* Sizes get a special category of their own. |
Line 236 mandoc_escape(const char **end, const char **start, in |
|
Line 231 mandoc_escape(const char **end, const char **start, in |
|
|
|
/* See +/- counts as a sign. */ |
/* See +/- counts as a sign. */ |
if ('+' == **end || '-' == **end || ASCII_HYPH == **end) |
if ('+' == **end || '-' == **end || ASCII_HYPH == **end) |
(*end)++; |
*start = ++*end; |
|
|
switch (**end) { |
switch (**end) { |
case '(': |
case '(': |
Line 251 mandoc_escape(const char **end, const char **start, in |
|
Line 246 mandoc_escape(const char **end, const char **start, in |
|
*start = ++*end; |
*start = ++*end; |
term = '\''; |
term = '\''; |
break; |
break; |
|
case '3': |
|
/* FALLTHROUGH */ |
|
case '2': |
|
/* FALLTHROUGH */ |
|
case '1': |
|
*sz = (*end)[-1] == 's' && |
|
isdigit((unsigned char)(*end)[1]) ? 2 : 1; |
|
break; |
default: |
default: |
*sz = 1; |
*sz = 1; |
break; |
break; |
Line 280 mandoc_escape(const char **end, const char **start, in |
|
Line 283 mandoc_escape(const char **end, const char **start, in |
|
while (**end != term) { |
while (**end != term) { |
switch (**end) { |
switch (**end) { |
case '\0': |
case '\0': |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
case '\\': |
case '\\': |
(*end)++; |
(*end)++; |
if (ESCAPE_ERROR == |
if (ESCAPE_ERROR == |
mandoc_escape(end, NULL, NULL)) |
mandoc_escape(end, NULL, NULL)) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
break; |
break; |
default: |
default: |
(*end)++; |
(*end)++; |
Line 296 mandoc_escape(const char **end, const char **start, in |
|
Line 299 mandoc_escape(const char **end, const char **start, in |
|
} else { |
} else { |
assert(*sz > 0); |
assert(*sz > 0); |
if ((size_t)*sz > strlen(*start)) |
if ((size_t)*sz > strlen(*start)) |
return(ESCAPE_ERROR); |
return ESCAPE_ERROR; |
*end += *sz; |
*end += *sz; |
} |
} |
|
|
Line 344 mandoc_escape(const char **end, const char **start, in |
|
Line 347 mandoc_escape(const char **end, const char **start, in |
|
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
if (1 == *sz && 'c' == **start) |
if (1 == *sz && 'c' == **start) |
gly = ESCAPE_NOSPACE; |
gly = ESCAPE_NOSPACE; |
|
/* |
|
* Unicode escapes are defined in groff as \[u0000] |
|
* to \[u10FFFF], where the contained value must be |
|
* a valid Unicode codepoint. Here, however, only |
|
* check the length and range. |
|
*/ |
|
if (**start != 'u' || *sz < 5 || *sz > 7) |
|
break; |
|
if (*sz == 7 && ((*start)[1] != '1' || (*start)[2] != '0')) |
|
break; |
|
if (*sz == 6 && (*start)[1] == '0') |
|
break; |
|
if ((int)strspn(*start + 1, "0123456789ABCDEFabcdef") |
|
+ 1 == *sz) |
|
gly = ESCAPE_UNICODE; |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
return(gly); |
return gly; |
} |
} |
|
|
/* |
/* |
Line 444 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 462 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
if ('\0' == *cp && (white || ' ' == cp[-1])) |
if ('\0' == *cp && (white || ' ' == cp[-1])) |
mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL); |
|
|
return(start); |
return start; |
} |
} |
|
|
static int |
static int |
Line 461 a2time(time_t *t, const char *fmt, const char *p) |
|
Line 479 a2time(time_t *t, const char *fmt, const char *p) |
|
#endif |
#endif |
if (NULL != pp && '\0' == *pp) { |
if (NULL != pp && '\0' == *pp) { |
*t = mktime(&tm); |
*t = mktime(&tm); |
return(1); |
return 1; |
} |
} |
|
|
return(0); |
return 0; |
} |
} |
|
|
static char * |
static char * |
Line 476 time2a(time_t t) |
|
Line 494 time2a(time_t t) |
|
int isz; |
int isz; |
|
|
tm = localtime(&t); |
tm = localtime(&t); |
|
if (tm == NULL) |
|
return NULL; |
|
|
/* |
/* |
* Reserve space: |
* Reserve space: |
Line 495 time2a(time_t t) |
|
Line 515 time2a(time_t t) |
|
|
|
if (0 == strftime(p, 4 + 1, "%Y", tm)) |
if (0 == strftime(p, 4 + 1, "%Y", tm)) |
goto fail; |
goto fail; |
return(buf); |
return buf; |
|
|
fail: |
fail: |
free(buf); |
free(buf); |
return(NULL); |
return NULL; |
} |
} |
|
|
char * |
char * |
Line 521 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
Line 541 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
t = 0; |
t = 0; |
} |
} |
out = t ? time2a(t) : NULL; |
out = t ? time2a(t) : NULL; |
return(out ? out : mandoc_strdup(in)); |
return out ? out : mandoc_strdup(in); |
} |
} |
|
|
int |
int |
Line 531 mandoc_eos(const char *p, size_t sz) |
|
Line 551 mandoc_eos(const char *p, size_t sz) |
|
int enclosed, found; |
int enclosed, found; |
|
|
if (0 == sz) |
if (0 == sz) |
return(0); |
return 0; |
|
|
/* |
/* |
* End-of-sentence recognition must include situations where |
* End-of-sentence recognition must include situations where |
Line 560 mandoc_eos(const char *p, size_t sz) |
|
Line 580 mandoc_eos(const char *p, size_t sz) |
|
found = 1; |
found = 1; |
break; |
break; |
default: |
default: |
return(found && (!enclosed || isalnum((unsigned char)*q))); |
return found && |
|
(!enclosed || isalnum((unsigned char)*q)); |
} |
} |
} |
} |
|
|
return(found && !enclosed); |
return found && !enclosed; |
} |
} |
|
|
/* |
/* |
Line 579 mandoc_strntoi(const char *p, size_t sz, int base) |
|
Line 600 mandoc_strntoi(const char *p, size_t sz, int base) |
|
long v; |
long v; |
|
|
if (sz > 31) |
if (sz > 31) |
return(-1); |
return -1; |
|
|
memcpy(buf, p, sz); |
memcpy(buf, p, sz); |
buf[(int)sz] = '\0'; |
buf[(int)sz] = '\0'; |
Line 588 mandoc_strntoi(const char *p, size_t sz, int base) |
|
Line 609 mandoc_strntoi(const char *p, size_t sz, int base) |
|
v = strtol(buf, &ep, base); |
v = strtol(buf, &ep, base); |
|
|
if (buf[0] == '\0' || *ep != '\0') |
if (buf[0] == '\0' || *ep != '\0') |
return(-1); |
return -1; |
|
|
if (v > INT_MAX) |
if (v > INT_MAX) |
v = INT_MAX; |
v = INT_MAX; |
if (v < INT_MIN) |
if (v < INT_MIN) |
v = INT_MIN; |
v = INT_MIN; |
|
|
return((int)v); |
return (int)v; |
} |
} |