version 1.76, 2014/03/23 11:25:26 |
version 1.90, 2015/01/01 18:11:45 |
|
|
/* $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 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 46 mandoc_escape(const char **end, const char **start, in |
|
Line 44 mandoc_escape(const char **end, const char **start, in |
|
const char *local_start; |
const char *local_start; |
int local_sz; |
int local_sz; |
char term; |
char term; |
enum mandoc_esc gly; |
enum mandoc_esc gly; |
|
|
/* |
/* |
* When the caller doesn't provide return storage, |
* When the caller doesn't provide return storage, |
Line 75 mandoc_escape(const char **end, const char **start, in |
|
Line 73 mandoc_escape(const char **end, const char **start, in |
|
* these, but each eventually returns a substring of the glyph |
* these, but each eventually returns a substring of the glyph |
* name. |
* name. |
*/ |
*/ |
case ('('): |
case '(': |
gly = ESCAPE_SPECIAL; |
gly = ESCAPE_SPECIAL; |
*sz = 2; |
*sz = 2; |
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; |
|
|
/* |
/* |
* Escapes taking no arguments at all. |
* Escapes taking no arguments at all. |
*/ |
*/ |
case ('d'): |
case 'd': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('u'): |
case 'u': |
return(ESCAPE_IGNORE); |
return(ESCAPE_IGNORE); |
|
|
/* |
/* |
* The \z escape is supposed to output the following |
* The \z escape is supposed to output the following |
* character without advancing the cursor position. |
* character without advancing the cursor position. |
* Since we are mostly dealing with terminal mode, |
* Since we are mostly dealing with terminal mode, |
* 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 |
* 'X' is the trigger. These have opaque sub-strings. |
* 'X' is the trigger. These have opaque sub-strings. |
*/ |
*/ |
case ('F'): |
case 'F': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('g'): |
case 'g': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('k'): |
case 'k': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('M'): |
case 'M': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('m'): |
case 'm': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('n'): |
case 'n': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('V'): |
case 'V': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('Y'): |
case 'Y': |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('f'): |
case 'f': |
if (ESCAPE_ERROR == gly) |
if (ESCAPE_ERROR == gly) |
gly = ESCAPE_FONT; |
gly = ESCAPE_FONT; |
switch (**start) { |
switch (**start) { |
case ('('): |
case '(': |
*start = ++*end; |
*start = ++*end; |
*sz = 2; |
*sz = 2; |
break; |
break; |
case ('['): |
case '[': |
*start = ++*end; |
*start = ++*end; |
term = ']'; |
term = ']'; |
break; |
break; |
Line 161 mandoc_escape(const char **end, const char **start, in |
|
Line 148 mandoc_escape(const char **end, const char **start, in |
|
/* |
/* |
* These escapes are of the form \X'Y', where 'X' is the trigger |
* These escapes are of the form \X'Y', where 'X' is the trigger |
* and 'Y' is any string. These have opaque sub-strings. |
* and 'Y' is any string. These have opaque sub-strings. |
|
* The \B and \w escapes are handled in roff.c, roff_res(). |
*/ |
*/ |
case ('A'): |
case 'A': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('b'): |
case 'b': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('B'): |
case 'D': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('D'): |
case 'o': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('o'): |
case 'R': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('R'): |
case 'X': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('w'): |
case 'Z': |
/* FALLTHROUGH */ |
if ('\0' == **start) |
case ('X'): |
|
/* FALLTHROUGH */ |
|
case ('Z'): |
|
if ('\'' != **start) |
|
return(ESCAPE_ERROR); |
return(ESCAPE_ERROR); |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
|
term = **start; |
*start = ++*end; |
*start = ++*end; |
term = '\''; |
|
break; |
break; |
|
|
/* |
/* |
* These escapes are of the form \X'N', where 'X' is the trigger |
* These escapes are of the form \X'N', where 'X' is the trigger |
* and 'N' resolves to a numerical expression. |
* and 'N' resolves to a numerical expression. |
*/ |
*/ |
case ('h'): |
case 'h': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('H'): |
case 'H': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('L'): |
case 'L': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('l'): |
case 'l': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('S'): |
case 'S': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('v'): |
case 'v': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('x'): |
case 'x': |
if ('\'' != **start) |
if (strchr(" %&()*+-./0123456789:<=>", **start)) { |
|
if ('\0' != **start) |
|
++*end; |
return(ESCAPE_ERROR); |
return(ESCAPE_ERROR); |
|
} |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
|
term = **start; |
*start = ++*end; |
*start = ++*end; |
term = '\''; |
|
break; |
break; |
|
|
/* |
/* |
* Special handling for the numbered character escape. |
* Special handling for the numbered character escape. |
* XXX Do any other escapes need similar handling? |
* XXX Do any other escapes need similar handling? |
*/ |
*/ |
case ('N'): |
case 'N': |
if ('\0' == **start) |
if ('\0' == **start) |
return(ESCAPE_ERROR); |
return(ESCAPE_ERROR); |
(*end)++; |
(*end)++; |
Line 230 mandoc_escape(const char **end, const char **start, in |
|
Line 217 mandoc_escape(const char **end, const char **start, in |
|
(*end)++; |
(*end)++; |
return(ESCAPE_NUMBERED); |
return(ESCAPE_NUMBERED); |
|
|
/* |
/* |
* Sizes get a special category of their own. |
* Sizes get a special category of their own. |
*/ |
*/ |
case ('s'): |
case 's': |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
|
|
/* 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 '(': |
*start = ++*end; |
*start = ++*end; |
*sz = 2; |
*sz = 2; |
break; |
break; |
case ('['): |
case '[': |
*start = ++*end; |
*start = ++*end; |
term = ']'; |
term = ']'; |
break; |
break; |
case ('\''): |
case '\'': |
*start = ++*end; |
*start = ++*end; |
term = '\''; |
term = '\''; |
break; |
break; |
Line 281 mandoc_escape(const char **end, const char **start, in |
|
Line 268 mandoc_escape(const char **end, const char **start, in |
|
if ('\0' != term) { |
if ('\0' != term) { |
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)) |
Line 305 mandoc_escape(const char **end, const char **start, in |
|
Line 292 mandoc_escape(const char **end, const char **start, in |
|
/* Run post-processors. */ |
/* Run post-processors. */ |
|
|
switch (gly) { |
switch (gly) { |
case (ESCAPE_FONT): |
case ESCAPE_FONT: |
if (2 == *sz) { |
if (2 == *sz) { |
if ('C' == **start) { |
if ('C' == **start) { |
/* |
/* |
Line 323 mandoc_escape(const char **end, const char **start, in |
|
Line 310 mandoc_escape(const char **end, const char **start, in |
|
break; |
break; |
|
|
switch (**start) { |
switch (**start) { |
case ('3'): |
case '3': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('B'): |
case 'B': |
gly = ESCAPE_FONTBOLD; |
gly = ESCAPE_FONTBOLD; |
break; |
break; |
case ('2'): |
case '2': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('I'): |
case 'I': |
gly = ESCAPE_FONTITALIC; |
gly = ESCAPE_FONTITALIC; |
break; |
break; |
case ('P'): |
case 'P': |
gly = ESCAPE_FONTPREV; |
gly = ESCAPE_FONTPREV; |
break; |
break; |
case ('1'): |
case '1': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('R'): |
case 'R': |
gly = ESCAPE_FONTROMAN; |
gly = ESCAPE_FONTROMAN; |
break; |
break; |
} |
} |
break; |
break; |
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 375 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 377 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
if ('"' == *start) { |
if ('"' == *start) { |
quoted = 1; |
quoted = 1; |
start++; |
start++; |
} |
} |
|
|
pairs = 0; |
pairs = 0; |
white = 0; |
white = 0; |
Line 394 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 396 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
* backslashes and backslash-t to literal tabs. |
* backslashes and backslash-t to literal tabs. |
*/ |
*/ |
switch (cp[1]) { |
switch (cp[1]) { |
case ('t'): |
case 't': |
cp[0] = '\t'; |
cp[0] = '\t'; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('\\'): |
case '\\': |
pairs++; |
pairs++; |
cp++; |
cp++; |
break; |
break; |
case (' '): |
case ' ': |
/* Skip escaped blanks. */ |
/* Skip escaped blanks. */ |
if (0 == quoted) |
if (0 == quoted) |
cp++; |
cp++; |
Line 430 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 432 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 444 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 446 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 458 a2time(time_t *t, const char *fmt, const char *p) |
|
Line 460 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 478 time2a(time_t t) |
|
Line 480 time2a(time_t t) |
|
int isz; |
int isz; |
|
|
tm = localtime(&t); |
tm = localtime(&t); |
|
if (tm == NULL) |
|
return(NULL); |
|
|
/* |
/* |
* Reserve space: |
* Reserve space: |
Line 512 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
Line 516 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; |
Line 544 mandoc_eos(const char *p, size_t sz) |
|
Line 548 mandoc_eos(const char *p, size_t sz) |
|
enclosed = found = 0; |
enclosed = found = 0; |
for (q = p + (int)sz - 1; q >= p; q--) { |
for (q = p + (int)sz - 1; q >= p; q--) { |
switch (*q) { |
switch (*q) { |
case ('\"'): |
case '\"': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('\''): |
case '\'': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (']'): |
case ']': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (')'): |
case ')': |
if (0 == found) |
if (0 == found) |
enclosed = 1; |
enclosed = 1; |
break; |
break; |
case ('.'): |
case '.': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('!'): |
case '!': |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('?'): |
case '?': |
found = 1; |
found = 1; |
break; |
break; |
default: |
default: |