version 1.47, 2011/04/17 09:08:19 |
version 1.51, 2011/05/14 17:54:42 |
|
|
|
|
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
|
#include <errno.h> |
|
#include <limits.h> |
#include <stdlib.h> |
#include <stdlib.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <string.h> |
#include <string.h> |
Line 95 numescape(const char *start) |
|
Line 97 numescape(const char *start) |
|
return(++i); |
return(++i); |
} |
} |
|
|
/* |
|
* Handle an escaped sequeence. This should be called with any |
|
* string subsequent a `\'. Pass a pointer to this substring as "end"; |
|
* it will be set to the supremum of the parsed escape sequence. If |
|
* this returns ESCAPE_ERROR, the string is bogus and should be thrown |
|
* away. If not ESCAPE_ERROR or ESCAPE_IGNORE, "start" is set to the |
|
* first relevant character of the substring (font, glyph, whatever) of |
|
* length sz. Both "start" and "sz" may be NULL. |
|
*/ |
|
enum mandoc_esc |
enum mandoc_esc |
mandoc_escape(const char **end, const char **start, int *sz) |
mandoc_escape(const char **end, const char **start, int *sz) |
{ |
{ |
Line 460 mandoc_strdup(const char *ptr) |
|
Line 453 mandoc_strdup(const char *ptr) |
|
* or to the null byte terminating the argument line. |
* or to the null byte terminating the argument line. |
*/ |
*/ |
char * |
char * |
mandoc_getarg(struct mparse *parse, |
mandoc_getarg(struct mparse *parse, char **cpp, int ln, int *pos) |
char **cpp, int ln, int dowarn, int *pos) |
|
{ |
{ |
char *start, *cp; |
char *start, *cp; |
int quoted, pairs, white; |
int quoted, pairs, white; |
Line 508 mandoc_getarg(struct mparse *parse, |
|
Line 500 mandoc_getarg(struct mparse *parse, |
|
} |
} |
|
|
/* Quoted argument without a closing quote. */ |
/* Quoted argument without a closing quote. */ |
if (dowarn && 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. */ |
/* Null-terminate this argument and move to the next one. */ |
Line 522 mandoc_getarg(struct mparse *parse, |
|
Line 514 mandoc_getarg(struct mparse *parse, |
|
*pos += (int)(cp - start) + (quoted ? 1 : 0); |
*pos += (int)(cp - start) + (quoted ? 1 : 0); |
*cpp = cp; |
*cpp = cp; |
|
|
if (dowarn && '\0' == *cp && (white || ' ' == cp[-1])) |
if ('\0' == *cp && (white || ' ' == cp[-1])) |
mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_EOLNSPACE, parse, ln, *pos, NULL); |
|
|
return(start); |
return(start); |
Line 613 mandoc_eos(const char *p, size_t sz, int enclosed) |
|
Line 605 mandoc_eos(const char *p, size_t sz, int enclosed) |
|
/* |
/* |
* End-of-sentence recognition must include situations where |
* End-of-sentence recognition must include situations where |
* some symbols, such as `)', allow prior EOS punctuation to |
* some symbols, such as `)', allow prior EOS punctuation to |
* propogate outward. |
* propagate outward. |
*/ |
*/ |
|
|
found = 0; |
found = 0; |
Line 696 mandoc_getcontrol(const char *cp, int *ppos) |
|
Line 688 mandoc_getcontrol(const char *cp, int *ppos) |
|
*ppos = pos; |
*ppos = pos; |
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* Convert a string to a long that may not be <0. |
|
* If the string is invalid, or is less than 0, return -1. |
|
*/ |
|
int |
|
mandoc_strntou(const char *p, size_t sz, int base) |
|
{ |
|
char buf[32]; |
|
char *ep; |
|
long v; |
|
|
|
if (sz > 31) |
|
return(-1); |
|
|
|
memcpy(buf, p, sz); |
|
buf[(int)sz] = '\0'; |
|
|
|
errno = 0; |
|
v = strtol(buf, &ep, base); |
|
|
|
if (buf[0] == '\0' || *ep != '\0') |
|
return(-1); |
|
|
|
if ((errno == ERANGE && |
|
(v == LONG_MAX || v == LONG_MIN)) || |
|
(v > INT_MAX || v < 0)) |
|
return(-1); |
|
|
|
return((int)v); |
|
} |
|
|