mandoc/man.c - diff

Return to man.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/man.c between version 1.31 and 1.34

version 1.31, 2009/08/19 11:58:32

version 1.34, 2009/08/21 12:12:12

Line 52 const char *const __man_macronames[MAN_MAX] = {

"R", "B", "I", "IR",

"RI", "na", "i", "sp",

"nf", "fi", "r", "RE",

"RS"

"RS", "DT"

};

const char * const *man_macronames = __man_macronames;

Line 68 static int man_alloc1(struct man *);

static int pstring(struct man *, int, int,

const char *, size_t);

#ifdef __linux__

extern size_t strlcpy(char *, const char *, size_t);

#endif

const struct man_node *

man_node(const struct man *m)

{

Line 450 descope:

Line 454 descope:

int

man_pmacro(struct man *m, int ln, char *buf)

{

int i, j, c, ppos, fl;

char mac[5];

struct man_node *n;

/* Comments and empties are quickly ignored. */

Line 508 man_pmacro(struct man *m, int ln, char *buf)

Line 513 man_pmacro(struct man *m, int ln, char *buf)

while (buf[i] && ' ' == buf[i])

i++;

/* Remove prior ELINE macro, if applicable. */

if (m->flags & MAN_ELINE) {

n = m->last;

assert(NULL == n->child);

if ( ! man_nwarn(m, n, WLNSCOPE))

return(0);

if (n->prev) {

assert(n != n->parent->child);

assert(n == n->prev->next);

n->prev->next = NULL;

m->last = n->prev;

} else {

assert(n == n->parent->child);

n->parent->child = NULL;

m->last = n->parent;

}

man_node_free(n);

m->flags &= ~MAN_ELINE;

}

/* Begin recursive parse sequence. */

assert(man_macros[c].fp);

Line 528 out:

Line 556 out:

return(1);

/* Close out the block scope opened in the prior line. */

/* XXX - this should be in man_action.c. */

assert(MAN_BLINE & m->flags);

m->flags &= ~MAN_BLINE;

CVSweb