=================================================================== RCS file: /cvs/mandoc/mandoc.c,v retrieving revision 1.85 retrieving revision 1.94 diff -u -p -r1.85 -r1.94 --- mandoc/mandoc.c 2014/08/16 19:00:01 1.85 +++ mandoc/mandoc.c 2015/10/06 18:32:19 1.94 @@ -1,7 +1,7 @@ -/* $Id: mandoc.c,v 1.85 2014/08/16 19:00:01 schwarze Exp $ */ +/* $Id: mandoc.c,v 1.94 2015/10/06 18:32:19 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2011-2015 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -79,24 +79,13 @@ mandoc_escape(const char **end, const char **start, in break; case '[': 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 = ']'; break; case 'C': if ('\'' != **start) - return(ESCAPE_ERROR); + return ESCAPE_ERROR; *start = ++*end; - if ('u' == (*start)[0] && '\'' != (*start)[1]) - gly = ESCAPE_UNICODE; - else - gly = ESCAPE_SPECIAL; + gly = ESCAPE_SPECIAL; term = '\''; break; @@ -106,7 +95,11 @@ mandoc_escape(const char **end, const char **start, in case 'd': /* FALLTHROUGH */ case 'u': - return(ESCAPE_IGNORE); + /* FALLTHROUGH */ + case ',': + /* FALLTHROUGH */ + case '/': + return ESCAPE_IGNORE; /* * The \z escape is supposed to output the following @@ -115,7 +108,7 @@ mandoc_escape(const char **end, const char **start, in * let us just skip the next character. */ case 'z': - return(ESCAPE_SKIPCHAR); + return ESCAPE_SKIPCHAR; /* * Handle all triggers matching \X(xy, \Xx, and \X[xxxx], where @@ -167,16 +160,18 @@ mandoc_escape(const char **end, const char **start, in /* FALLTHROUGH */ case 'D': /* FALLTHROUGH */ - case 'o': - /* FALLTHROUGH */ case 'R': /* FALLTHROUGH */ case 'X': /* FALLTHROUGH */ case 'Z': - if ('\0' == **start) - return(ESCAPE_ERROR); gly = ESCAPE_IGNORE; + /* FALLTHROUGH */ + case 'o': + if (**start == '\0') + return ESCAPE_ERROR; + if (gly == ESCAPE_ERROR) + gly = ESCAPE_OVERSTRIKE; term = **start; *start = ++*end; break; @@ -199,8 +194,9 @@ mandoc_escape(const char **end, const char **start, in /* FALLTHROUGH */ case 'x': if (strchr(" %&()*+-./0123456789:<=>", **start)) { - ++*end; - return(ESCAPE_ERROR); + if ('\0' != **start) + ++*end; + return ESCAPE_ERROR; } gly = ESCAPE_IGNORE; term = **start; @@ -213,11 +209,11 @@ mandoc_escape(const char **end, const char **start, in */ case 'N': if ('\0' == **start) - return(ESCAPE_ERROR); + return ESCAPE_ERROR; (*end)++; if (isdigit((unsigned char)**start)) { *sz = 1; - return(ESCAPE_IGNORE); + return ESCAPE_IGNORE; } (*start)++; while (isdigit((unsigned char)**end)) @@ -225,7 +221,7 @@ mandoc_escape(const char **end, const char **start, in *sz = *end - *start; if ('\0' != **end) (*end)++; - return(ESCAPE_NUMBERED); + return ESCAPE_NUMBERED; /* * Sizes get a special category of their own. @@ -235,7 +231,7 @@ mandoc_escape(const char **end, const char **start, in /* See +/- counts as a sign. */ if ('+' == **end || '-' == **end || ASCII_HYPH == **end) - (*end)++; + *start = ++*end; switch (**end) { case '(': @@ -250,6 +246,14 @@ mandoc_escape(const char **end, const char **start, in *start = ++*end; term = '\''; break; + case '3': + /* FALLTHROUGH */ + case '2': + /* FALLTHROUGH */ + case '1': + *sz = (*end)[-1] == 's' && + isdigit((unsigned char)(*end)[1]) ? 2 : 1; + break; default: *sz = 1; break; @@ -279,12 +283,12 @@ mandoc_escape(const char **end, const char **start, in while (**end != term) { switch (**end) { case '\0': - return(ESCAPE_ERROR); + return ESCAPE_ERROR; case '\\': (*end)++; if (ESCAPE_ERROR == mandoc_escape(end, NULL, NULL)) - return(ESCAPE_ERROR); + return ESCAPE_ERROR; break; default: (*end)++; @@ -295,7 +299,7 @@ mandoc_escape(const char **end, const char **start, in } else { assert(*sz > 0); if ((size_t)*sz > strlen(*start)) - return(ESCAPE_ERROR); + return ESCAPE_ERROR; *end += *sz; } @@ -343,12 +347,27 @@ mandoc_escape(const char **end, const char **start, in case ESCAPE_SPECIAL: if (1 == *sz && 'c' == **start) 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; default: break; } - return(gly); + return gly; } /* @@ -443,7 +462,7 @@ mandoc_getarg(struct mparse *parse, char **cpp, int ln if ('\0' == *cp && (white || ' ' == cp[-1])) mandoc_msg(MANDOCERR_SPACE_EOL, parse, ln, *pos, NULL); - return(start); + return start; } static int @@ -460,10 +479,10 @@ a2time(time_t *t, const char *fmt, const char *p) #endif if (NULL != pp && '\0' == *pp) { *t = mktime(&tm); - return(1); + return 1; } - return(0); + return 0; } static char * @@ -475,6 +494,8 @@ time2a(time_t t) int isz; tm = localtime(&t); + if (tm == NULL) + return NULL; /* * Reserve space: @@ -494,11 +515,11 @@ time2a(time_t t) if (0 == strftime(p, 4 + 1, "%Y", tm)) goto fail; - return(buf); + return buf; fail: free(buf); - return(NULL); + return NULL; } char * @@ -520,7 +541,7 @@ mandoc_normdate(struct mparse *parse, char *in, int ln t = 0; } out = t ? time2a(t) : NULL; - return(out ? out : mandoc_strdup(in)); + return out ? out : mandoc_strdup(in); } int @@ -530,7 +551,7 @@ mandoc_eos(const char *p, size_t sz) int enclosed, found; if (0 == sz) - return(0); + return 0; /* * End-of-sentence recognition must include situations where @@ -559,11 +580,12 @@ mandoc_eos(const char *p, size_t sz) found = 1; break; default: - return(found && (!enclosed || isalnum((unsigned char)*q))); + return found && + (!enclosed || isalnum((unsigned char)*q)); } } - return(found && !enclosed); + return found && !enclosed; } /* @@ -578,7 +600,7 @@ mandoc_strntoi(const char *p, size_t sz, int base) long v; if (sz > 31) - return(-1); + return -1; memcpy(buf, p, sz); buf[(int)sz] = '\0'; @@ -587,12 +609,12 @@ mandoc_strntoi(const char *p, size_t sz, int base) v = strtol(buf, &ep, base); if (buf[0] == '\0' || *ep != '\0') - return(-1); + return -1; if (v > INT_MAX) v = INT_MAX; if (v < INT_MIN) v = INT_MIN; - return((int)v); + return (int)v; }