version 1.27, 2009/06/11 12:07:49 |
version 1.29, 2009/06/16 19:13:28 |
Line 74 struct curparse { |
|
Line 74 struct curparse { |
|
#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ |
#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ |
#define NO_IGN_MACRO (1 << 2) /* Don't ignore bad macros. */ |
#define NO_IGN_MACRO (1 << 2) /* Don't ignore bad macros. */ |
#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ |
#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ |
enum intt inttype; /* Input parsers. */ |
enum intt inttype; /* Input parsers... */ |
struct man *man; |
struct man *man; |
struct man *lastman; |
struct man *lastman; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct mdoc *lastmdoc; |
struct mdoc *lastmdoc; |
enum outt outtype; /* Output devices. */ |
enum outt outtype; /* Output devices... */ |
out_mdoc outmdoc; |
out_mdoc outmdoc; |
out_man outman; |
out_man outman; |
out_free outfree; |
out_free outfree; |
Line 259 mdoc_init(struct curparse *curp) |
|
Line 259 mdoc_init(struct curparse *curp) |
|
struct mdoc *mdoc; |
struct mdoc *mdoc; |
struct mdoc_cb mdoccb; |
struct mdoc_cb mdoccb; |
|
|
mdoccb.mdoc_msg = NULL; |
|
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_err = merr; |
mdoccb.mdoc_warn = mdocwarn; |
mdoccb.mdoc_warn = mdocwarn; |
|
|
Line 326 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 325 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
size_t sz; |
size_t sz; |
ssize_t ssz; |
ssize_t ssz; |
struct stat st; |
struct stat st; |
int j, i, pos, lnn; |
int j, i, pos, lnn, comment; |
struct man *man; |
struct man *man; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
|
|
Line 356 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 355 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
|
|
/* Fill buf with file blocksize. */ |
/* Fill buf with file blocksize. */ |
|
|
for (lnn = 0, pos = 0; ; ) { |
for (lnn = pos = comment = 0; ; ) { |
if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { |
if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { |
warn("%s", curp->file); |
warn("%s", curp->file); |
return(0); |
return(0); |
Line 376 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 375 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
} |
} |
|
|
if ('\n' != blk->buf[i]) { |
if ('\n' != blk->buf[i]) { |
|
if (comment) |
|
continue; |
ln->buf[pos++] = blk->buf[i]; |
ln->buf[pos++] = blk->buf[i]; |
|
|
|
/* Handle in-line `\"' comments. */ |
|
|
|
if (1 == pos || '\"' != ln->buf[pos - 1]) |
|
continue; |
|
|
|
for (j = pos - 2; j >= 0; j--) |
|
if ('\\' != ln->buf[j]) |
|
break; |
|
|
|
if ( ! ((pos - 2 - j) % 2)) |
|
continue; |
|
|
|
comment = 1; |
|
pos -= 2; |
continue; |
continue; |
} |
} |
|
|
/* Check for CPP-escaped newline. */ |
/* Handle escaped `\\n' newlines. */ |
|
|
if (pos > 0 && '\\' == ln->buf[pos - 1]) { |
if (pos > 0 && 0 == comment && |
|
'\\' == ln->buf[pos - 1]) { |
for (j = pos - 1; j >= 0; j--) |
for (j = pos - 1; j >= 0; j--) |
if ('\\' != ln->buf[j]) |
if ('\\' != ln->buf[j]) |
break; |
break; |
|
|
if ( ! ((pos - j) % 2)) { |
if ( ! ((pos - j) % 2)) { |
pos--; |
pos--; |
lnn++; |
lnn++; |
Line 396 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 412 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
|
|
ln->buf[pos] = 0; |
ln->buf[pos] = 0; |
lnn++; |
lnn++; |
|
|
/* |
|
* If no manual parser has been assigned, then |
|
* try to assign one in pset(), which may do |
|
* nothing at all. After this, parse the manual |
|
* line accordingly. |
|
*/ |
|
|
|
|
/* If unset, assign parser in pset(). */ |
|
|
if ( ! (man || mdoc) && ! pset(ln->buf, |
if ( ! (man || mdoc) && ! pset(ln->buf, |
pos, curp, &man, &mdoc)) |
pos, curp, &man, &mdoc)) |
return(0); |
return(0); |
|
|
pos = 0; |
pos = comment = 0; |
|
|
if (man && ! man_parseln(man, lnn, ln->buf)) |
if (man && ! man_parseln(man, lnn, ln->buf)) |
return(0); |
return(0); |
Line 417 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 428 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
} |
} |
} |
} |
|
|
/* Note that a parser may not have been assigned, yet. */ |
/* NOTE a parser may not have been assigned, yet. */ |
|
|
if ( ! (man || mdoc)) { |
if ( ! (man || mdoc)) { |
warnx("%s: not a manual", curp->file); |
warnx("%s: not a manual", curp->file); |
Line 429 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
Line 440 fdesc(struct buf *blk, struct buf *ln, struct curparse |
|
if (man && ! man_endparse(man)) |
if (man && ! man_endparse(man)) |
return(0); |
return(0); |
|
|
/* |
/* If unset, allocate output dev now (if applicable). */ |
* If an output device hasn't been allocated, see if we should |
|
* do so now. Note that not all outtypes have functions, so |
|
* this switch statement may be superfluous, but it's |
|
* low-overhead enough not to matter very much. |
|
*/ |
|
|
|
if ( ! (curp->outman && curp->outmdoc)) { |
if ( ! (curp->outman && curp->outmdoc)) { |
switch (curp->outtype) { |
switch (curp->outtype) { |
|
|
pset(const char *buf, int pos, struct curparse *curp, |
pset(const char *buf, int pos, struct curparse *curp, |
struct man **man, struct mdoc **mdoc) |
struct man **man, struct mdoc **mdoc) |
{ |
{ |
|
int i; |
|
|
/* |
/* |
* Try to intuit which kind of manual parser should be used. If |
* Try to intuit which kind of manual parser should be used. If |
Line 479 pset(const char *buf, int pos, struct curparse *curp, |
|
Line 486 pset(const char *buf, int pos, struct curparse *curp, |
|
* default to -man, which is more lenient. |
* default to -man, which is more lenient. |
*/ |
*/ |
|
|
if (pos >= 3 && 0 == memcmp(buf, ".\\\"", 3)) |
if (buf[0] == '.') { |
return(1); |
for (i = 1; buf[i]; i++) |
|
if (' ' != buf[i] && '\t' != buf[i]) |
|
break; |
|
if (0 == buf[i]) |
|
return(1); |
|
} |
|
|
switch (curp->inttype) { |
switch (curp->inttype) { |
case (INTT_MDOC): |
case (INTT_MDOC): |