version 1.70, 2013/11/10 21:34:04 |
version 1.75, 2013/12/31 23:23:10 |
Line 40 static char *time2a(time_t); |
|
Line 40 static char *time2a(time_t); |
|
|
|
|
|
enum mandoc_esc |
enum mandoc_esc |
mandoc_escape(const char const **end, const char const **start, int *sz) |
mandoc_escape(const char **end, const char **start, int *sz) |
{ |
{ |
const char *local_start; |
const char *local_start; |
int local_sz; |
int local_sz; |
Line 102 mandoc_escape(const char const **end, const char const |
|
Line 102 mandoc_escape(const char const **end, const char const |
|
break; |
break; |
|
|
/* |
/* |
|
* Escapes taking no arguments at all. |
|
*/ |
|
case ('d'): |
|
/* FALLTHROUGH */ |
|
case ('u'): |
|
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, |
Line 157 mandoc_escape(const char const **end, const char const |
|
Line 165 mandoc_escape(const char const **end, const char const |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('b'): |
case ('b'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case ('B'): |
|
/* FALLTHROUGH */ |
case ('D'): |
case ('D'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('o'): |
case ('o'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('R'): |
case ('R'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case ('w'): |
|
/* FALLTHROUGH */ |
case ('X'): |
case ('X'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('Z'): |
case ('Z'): |
Line 177 mandoc_escape(const char const **end, const char const |
|
Line 189 mandoc_escape(const char const **end, const char const |
|
* 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 ('B'): |
|
/* FALLTHROUGH */ |
|
case ('h'): |
case ('h'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('H'): |
case ('H'): |
Line 186 mandoc_escape(const char const **end, const char const |
|
Line 196 mandoc_escape(const char const **end, const char const |
|
case ('L'): |
case ('L'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('l'): |
case ('l'): |
gly = ESCAPE_NUMBERED; |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('S'): |
case ('S'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('v'): |
case ('v'): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('w'): |
|
/* FALLTHROUGH */ |
|
case ('x'): |
case ('x'): |
if ('\'' != **start) |
if ('\'' != **start) |
return(ESCAPE_ERROR); |
return(ESCAPE_ERROR); |
if (ESCAPE_ERROR == gly) |
gly = ESCAPE_IGNORE; |
gly = ESCAPE_IGNORE; |
|
*start = ++*end; |
*start = ++*end; |
term = '\''; |
term = '\''; |
break; |
break; |
Line 419 mandoc_strdup(const char *ptr) |
|
Line 425 mandoc_strdup(const char *ptr) |
|
* Parse a quoted or unquoted roff-style request or macro argument. |
* Parse a quoted or unquoted roff-style request or macro argument. |
* Return a pointer to the parsed argument, which is either the original |
* Return a pointer to the parsed argument, which is either the original |
* pointer or advanced by one byte in case the argument is quoted. |
* pointer or advanced by one byte in case the argument is quoted. |
* Null-terminate the argument in place. |
* NUL-terminate the argument in place. |
* Collapse pairs of quotes inside quoted arguments. |
* Collapse pairs of quotes inside quoted arguments. |
* Advance the argument pointer to the next argument, |
* Advance the argument pointer to the next argument, |
* or to the null byte terminating the argument line. |
* or to the NUL byte terminating the argument line. |
*/ |
*/ |
char * |
char * |
mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos) |
mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos) |
Line 493 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
Line 499 mandoc_getarg(struct mparse *parse, char **cpp, int ln |
|
if (1 == quoted) |
if (1 == quoted) |
mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_BADQUOTE, parse, ln, *pos, NULL); |
|
|
/* Null-terminate this argument and move to the next one. */ |
/* NUL-terminate this argument and move to the next one. */ |
if (pairs) |
if (pairs) |
cp[-pairs] = '\0'; |
cp[-pairs] = '\0'; |
if ('\0' != *cp) { |
if ('\0' != *cp) { |
Line 588 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
Line 594 mandoc_normdate(struct mparse *parse, char *in, int ln |
|
} |
} |
|
|
int |
int |
mandoc_eos(const char *p, size_t sz, int enclosed) |
mandoc_eos(const char *p, size_t sz) |
{ |
{ |
const char *q; |
const char *q; |
int found; |
int enclosed, found; |
|
|
if (0 == sz) |
if (0 == sz) |
return(0); |
return(0); |
Line 602 mandoc_eos(const char *p, size_t sz, int enclosed) |
|
Line 608 mandoc_eos(const char *p, size_t sz, int enclosed) |
|
* propagate outward. |
* propagate outward. |
*/ |
*/ |
|
|
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 ('\"'): |