version 1.79, 2014/04/20 16:46:04 |
version 1.93, 2015/08/29 22:40:05 |
|
|
/* $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 |
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
*/ |
*/ |
#ifdef HAVE_CONFIG_H |
|
#include "config.h" |
#include "config.h" |
#endif |
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
|
|
Line 81 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 108 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': |
|
/* FALLTHROUGH */ |
|
case ',': |
|
/* FALLTHROUGH */ |
|
case '/': |
return(ESCAPE_IGNORE); |
return(ESCAPE_IGNORE); |
|
|
/* |
/* |
Line 169 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 200 mandoc_escape(const char **end, const char **start, in |
|
Line 193 mandoc_escape(const char **end, const char **start, in |
|
case 'v': |
case 'v': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case 'x': |
case 'x': |
if (strchr("\0 %&()*+-./0123456789:<=>", **start)) |
if (strchr(" %&()*+-./0123456789:<=>", **start)) { |
|
if ('\0' != **start) |
|
++*end; |
return(ESCAPE_ERROR); |
return(ESCAPE_ERROR); |
|
} |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
term = **start; |
term = **start; |
*start = ++*end; |
*start = ++*end; |
Line 235 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 250 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 343 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; |
Line 427 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 446 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
|
|
/* Quoted argument without a closing quote. */ |
/* Quoted argument without a closing quote. */ |
if (1 == quoted) |
if (1 == quoted) |
mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_ARG_QUOTE, parse, ln, *pos, NULL); |
|
|
/* NUL-terminate this argument and move to the next one. */ |
/* NUL-terminate this argument and move to the next one. */ |
if (pairs) |
if (pairs) |
Line 441 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 460 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
*cpp = cp; |
*cpp = cp; |
|
|
if ('\0' == *cp && (white || ' ' == cp[-1])) |
if ('\0' == *cp && (white || ' ' == cp[-1])) |
mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL); |
|
|
return(start); |
return(start); |
} |
} |
Line 455 a2time(time_t *t, const char *fmt, const char *p) |
|
Line 474 a2time(time_t *t, const char *fmt, const char *p) |
|
memset(&tm, 0, sizeof(struct tm)); |
memset(&tm, 0, sizeof(struct tm)); |
|
|
pp = NULL; |
pp = NULL; |
#ifdef HAVE_STRPTIME |
#if HAVE_STRPTIME |
pp = strptime(p, fmt, &tm); |
pp = strptime(p, fmt, &tm); |
#endif |
#endif |
if (NULL != pp && '\0' == *pp) { |
if (NULL != pp && '\0' == *pp) { |
Line 475 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 509 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
Line 530 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
|
|
if (NULL == in || '\0' == *in || |
if (NULL == in || '\0' == *in || |
0 == strcmp(in, "$" "Mdocdate$")) { |
0 == strcmp(in, "$" "Mdocdate$")) { |
mandoc_msg(MANDOCERR_NODATE, parse, ln, pos, NULL); |
mandoc_msg(MANDOCERR_DATE_MISSING, parse, ln, pos, NULL); |
time(&t); |
time(&t); |
} |
} |
else if (a2time(&t, "%Y-%m-%d", in)) |
else if (a2time(&t, "%Y-%m-%d", in)) |
t = 0; |
t = 0; |
else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) && |
else if (!a2time(&t, "$" "Mdocdate: %b %d %Y $", in) && |
!a2time(&t, "%b %d, %Y", in)) { |
!a2time(&t, "%b %d, %Y", in)) { |
mandoc_msg(MANDOCERR_BADDATE, parse, ln, pos, NULL); |
mandoc_msg(MANDOCERR_DATE_BAD, parse, ln, pos, in); |
t = 0; |
t = 0; |
} |
} |
out = t ? time2a(t) : NULL; |
out = t ? time2a(t) : NULL; |