version 1.188, 2012/07/16 09:51:54 |
version 1.207, 2014/03/30 23:28:06 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> |
|
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#include "config.h" |
#include "config.h" |
#endif |
#endif |
|
|
#ifndef OSNAME |
#ifndef OSNAME |
#include <sys/utsname.h> |
#include <sys/utsname.h> |
#endif |
#endif |
|
|
|
|
|
|
#include "mdoc.h" |
#include "mdoc.h" |
#include "mandoc.h" |
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
|
|
#define POST_ARGS struct mdoc *mdoc |
#define POST_ARGS struct mdoc *mdoc |
|
|
#define NUMSIZ 32 |
#define NUMSIZ 32 |
#define DATESIZE 32 |
|
|
|
enum check_ineq { |
enum check_ineq { |
CHECK_LT, |
CHECK_LT, |
Line 72 static void check_text(struct mdoc *, int, int, char |
|
Line 73 static void check_text(struct mdoc *, int, int, char |
|
static void check_argv(struct mdoc *, |
static void check_argv(struct mdoc *, |
struct mdoc_node *, struct mdoc_argv *); |
struct mdoc_node *, struct mdoc_argv *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
static int concat(char *, const struct mdoc_node *, size_t); |
|
static enum mdoc_sec a2sec(const char *); |
static enum mdoc_sec a2sec(const char *); |
static size_t macro2len(enum mdoct); |
static size_t macro2len(enum mdoct); |
|
|
Line 97 static int post_bl_block_width(POST_ARGS); |
|
Line 97 static int post_bl_block_width(POST_ARGS); |
|
static int post_bl_block_tag(POST_ARGS); |
static int post_bl_block_tag(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static int post_bx(POST_ARGS); |
static int post_bx(POST_ARGS); |
|
static int post_defaults(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_defaults(POST_ARGS); |
|
static int post_literal(POST_ARGS); |
|
static int post_eoln(POST_ARGS); |
static int post_eoln(POST_ARGS); |
|
static int post_hyph(POST_ARGS); |
|
static int post_ignpar(POST_ARGS); |
static int post_it(POST_ARGS); |
static int post_it(POST_ARGS); |
static int post_lb(POST_ARGS); |
static int post_lb(POST_ARGS); |
|
static int post_literal(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_ns(POST_ARGS); |
static int post_ns(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_par(POST_ARGS); |
static int post_par(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
|
static int post_prol(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_rs(POST_ARGS); |
static int post_rs(POST_ARGS); |
Line 142 static v_post posts_bx[] = { post_bx, NULL }; |
|
Line 143 static v_post posts_bx[] = { post_bx, NULL }; |
|
static v_post posts_bool[] = { ebool, NULL }; |
static v_post posts_bool[] = { ebool, NULL }; |
static v_post posts_eoln[] = { post_eoln, NULL }; |
static v_post posts_eoln[] = { post_eoln, NULL }; |
static v_post posts_defaults[] = { post_defaults, NULL }; |
static v_post posts_defaults[] = { post_defaults, NULL }; |
|
static v_post posts_d1[] = { bwarn_ge1, post_hyph, NULL }; |
static v_post posts_dd[] = { post_dd, post_prol, NULL }; |
static v_post posts_dd[] = { post_dd, post_prol, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
|
static v_post posts_hyph[] = { post_hyph, NULL }; |
|
static v_post posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_lb[] = { post_lb, NULL }; |
static v_post posts_lb[] = { post_lb, NULL }; |
static v_post posts_nd[] = { berr_ge1, NULL }; |
static v_post posts_nd[] = { berr_ge1, post_hyph, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_ns[] = { post_ns, NULL }; |
static v_post posts_ns[] = { post_ns, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_pp[] = { post_par, ewarn_eq0, NULL }; |
static v_post posts_pp[] = { post_par, ewarn_eq0, NULL }; |
static v_post posts_rs[] = { post_rs, NULL }; |
static v_post posts_rs[] = { post_rs, NULL }; |
static v_post posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL }; |
static v_post posts_sh[] = { post_ignpar,hwarn_ge1,post_sh,post_hyph,NULL }; |
static v_post posts_sp[] = { post_par, ewarn_le1, NULL }; |
static v_post posts_sp[] = { post_par, ewarn_le1, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL }; |
static v_post posts_st[] = { post_st, NULL }; |
static v_post posts_st[] = { post_st, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, NULL }; |
|
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
Line 171 static v_pre pres_d1[] = { pre_display, NULL }; |
|
Line 174 static v_pre pres_d1[] = { pre_display, NULL }; |
|
static v_pre pres_dl[] = { pre_literal, pre_display, NULL }; |
static v_pre pres_dl[] = { pre_literal, pre_display, NULL }; |
static v_pre pres_dd[] = { pre_dd, NULL }; |
static v_pre pres_dd[] = { pre_dd, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
|
static v_pre pres_fd[] = { NULL, NULL }; |
|
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
Line 188 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 189 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ pres_pp, posts_pp }, /* Pp */ |
{ pres_pp, posts_pp }, /* Pp */ |
{ pres_d1, posts_wline }, /* D1 */ |
{ pres_d1, posts_d1 }, /* D1 */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
Line 201 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 202 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ pres_er, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_std, posts_std }, /* Ex */ |
{ pres_std, posts_std }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ pres_fd, posts_text }, /* Fd */ |
{ NULL, posts_text }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fn */ |
{ NULL, NULL }, /* Fn */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, NULL }, /* Ft */ |
Line 223 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 224 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_text }, /* Xr */ |
{ NULL, posts_text }, /* Xr */ |
{ NULL, posts_text }, /* %A */ |
{ NULL, posts_text }, /* %A */ |
{ NULL, posts_text }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_text }, /* %D */ |
{ NULL, posts_text }, /* %D */ |
{ NULL, posts_text }, /* %I */ |
{ NULL, posts_text }, /* %I */ |
{ NULL, posts_text }, /* %J */ |
{ NULL, posts_text }, /* %J */ |
{ NULL, posts_text }, /* %N */ |
{ NULL, posts_hyphtext }, /* %N */ |
{ NULL, posts_text }, /* %O */ |
{ NULL, posts_hyphtext }, /* %O */ |
{ NULL, posts_text }, /* %P */ |
{ NULL, posts_text }, /* %P */ |
{ NULL, posts_text }, /* %R */ |
{ NULL, posts_hyphtext }, /* %R */ |
{ NULL, posts_text }, /* %T */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_hyphtext }, /* %T */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, posts_text }, /* %V */ |
{ NULL, posts_text }, /* %V */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ao */ |
{ NULL, NULL }, /* Ao */ |
Line 271 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 272 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, NULL }, /* Sx */ |
{ NULL, posts_hyph }, /* Sx */ |
{ NULL, NULL }, /* Sy */ |
{ NULL, NULL }, /* Sy */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Ux */ |
{ NULL, NULL }, /* Ux */ |
Line 303 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 304 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_sp }, /* sp */ |
{ NULL, posts_sp }, /* sp */ |
{ NULL, posts_text1 }, /* %U */ |
{ NULL, posts_text1 }, /* %U */ |
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
|
{ NULL, NULL }, /* ll */ |
}; |
}; |
|
|
#define RSORD_MAX 14 /* Number of `Rs' blocks. */ |
#define RSORD_MAX 14 /* Number of `Rs' blocks. */ |
Line 319 static const enum mdoct rsord[RSORD_MAX] = { |
|
Line 321 static const enum mdoct rsord[RSORD_MAX] = { |
|
MDOC__U, |
MDOC__U, |
MDOC__P, |
MDOC__P, |
MDOC__Q, |
MDOC__Q, |
|
MDOC__C, |
MDOC__D, |
MDOC__D, |
MDOC__O, |
MDOC__O |
MDOC__C |
|
}; |
}; |
|
|
static const char * const secnames[SEC__MAX] = { |
static const char * const secnames[SEC__MAX] = { |
Line 416 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 418 mdoc_valid_post(struct mdoc *mdoc) |
|
} |
} |
|
|
static int |
static int |
check_count(struct mdoc *m, enum mdoc_type type, |
check_count(struct mdoc *mdoc, enum mdoc_type type, |
enum check_lvl lvl, enum check_ineq ineq, int val) |
enum check_lvl lvl, enum check_ineq ineq, int val) |
{ |
{ |
const char *p; |
const char *p; |
enum mandocerr t; |
enum mandocerr t; |
|
|
if (m->last->type != type) |
if (mdoc->last->type != type) |
return(1); |
return(1); |
|
|
switch (ineq) { |
switch (ineq) { |
case (CHECK_LT): |
case (CHECK_LT): |
p = "less than "; |
p = "less than "; |
if (m->last->nchild < val) |
if (mdoc->last->nchild < val) |
return(1); |
return(1); |
break; |
break; |
case (CHECK_GT): |
case (CHECK_GT): |
p = "more than "; |
p = "more than "; |
if (m->last->nchild > val) |
if (mdoc->last->nchild > val) |
return(1); |
return(1); |
break; |
break; |
case (CHECK_EQ): |
case (CHECK_EQ): |
p = ""; |
p = ""; |
if (val == m->last->nchild) |
if (val == mdoc->last->nchild) |
return(1); |
return(1); |
break; |
break; |
default: |
default: |
Line 447 check_count(struct mdoc *m, enum mdoc_type type, |
|
Line 449 check_count(struct mdoc *m, enum mdoc_type type, |
|
} |
} |
|
|
t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT; |
t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT; |
mandoc_vmsg(t, m->parse, m->last->line, m->last->pos, |
mandoc_vmsg(t, mdoc->parse, mdoc->last->line, mdoc->last->pos, |
"want %s%d children (have %d)", |
"want %s%d children (have %d)", |
p, val, m->last->nchild); |
p, val, mdoc->last->nchild); |
return(1); |
return(1); |
} |
} |
|
|
Line 515 hwarn_le1(POST_ARGS) |
|
Line 517 hwarn_le1(POST_ARGS) |
|
} |
} |
|
|
static void |
static void |
check_args(struct mdoc *m, struct mdoc_node *n) |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
int i; |
int i; |
|
|
Line 524 check_args(struct mdoc *m, struct mdoc_node *n) |
|
Line 526 check_args(struct mdoc *m, struct mdoc_node *n) |
|
|
|
assert(n->args->argc); |
assert(n->args->argc); |
for (i = 0; i < (int)n->args->argc; i++) |
for (i = 0; i < (int)n->args->argc; i++) |
check_argv(m, n, &n->args->argv[i]); |
check_argv(mdoc, n, &n->args->argv[i]); |
} |
} |
|
|
static void |
static void |
check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v) |
check_argv(struct mdoc *mdoc, struct mdoc_node *n, struct mdoc_argv *v) |
{ |
{ |
int i; |
int i; |
|
|
for (i = 0; i < (int)v->sz; i++) |
for (i = 0; i < (int)v->sz; i++) |
check_text(m, v->line, v->pos, v->value[i]); |
check_text(mdoc, v->line, v->pos, v->value[i]); |
|
|
/* FIXME: move to post_std(). */ |
/* FIXME: move to post_std(). */ |
|
|
if (MDOC_Std == v->arg) |
if (MDOC_Std == v->arg) |
if ( ! (v->sz || m->meta.name)) |
if ( ! (v->sz || mdoc->meta.name)) |
mdoc_nmsg(m, n, MANDOCERR_NONAME); |
mdoc_nmsg(mdoc, n, MANDOCERR_NONAME); |
} |
} |
|
|
static void |
static void |
check_text(struct mdoc *m, int ln, int pos, char *p) |
check_text(struct mdoc *mdoc, int ln, int pos, char *p) |
{ |
{ |
char *cp; |
char *cp; |
|
|
if (MDOC_LITERAL & m->flags) |
if (MDOC_LITERAL & mdoc->flags) |
return; |
return; |
|
|
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
mdoc_pmsg(m, ln, pos + (int)(p - cp), MANDOCERR_BADTAB); |
mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB); |
} |
} |
|
|
static int |
static int |
Line 888 pre_sh(PRE_ARGS) |
|
Line 890 pre_sh(PRE_ARGS) |
|
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
roff_regunset(mdoc->roff, REG_nS); |
|
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
} |
} |
|
|
Line 1122 post_vt(POST_ARGS) |
|
Line 1122 post_vt(POST_ARGS) |
|
static int |
static int |
post_nm(POST_ARGS) |
post_nm(POST_ARGS) |
{ |
{ |
char buf[BUFSIZ]; |
|
int c; |
|
|
|
if (NULL != mdoc->meta.name) |
if (NULL != mdoc->meta.name) |
return(1); |
return(1); |
|
|
/* Try to use our children for setting the meta name. */ |
mdoc_deroff(&mdoc->meta.name, mdoc->last); |
|
|
if (NULL != mdoc->last->child) { |
if (NULL == mdoc->meta.name) { |
buf[0] = '\0'; |
|
c = concat(buf, mdoc->last->child, BUFSIZ); |
|
} else |
|
c = 0; |
|
|
|
switch (c) { |
|
case (-1): |
|
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
|
return(0); |
|
case (0): |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME); |
mdoc->meta.name = mandoc_strdup("UNKNOWN"); |
mdoc->meta.name = mandoc_strdup("UNKNOWN"); |
break; |
|
default: |
|
mdoc->meta.name = mandoc_strdup(buf); |
|
break; |
|
} |
} |
return(1); |
return(1); |
} |
} |
Line 1353 post_it(POST_ARGS) |
|
Line 1337 post_it(POST_ARGS) |
|
static int |
static int |
post_bl_block(POST_ARGS) |
post_bl_block(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n, *ni, *nc; |
|
|
/* |
/* |
* These are fairly complicated, so we've broken them into two |
* These are fairly complicated, so we've broken them into two |
Line 1369 post_bl_block(POST_ARGS) |
|
Line 1353 post_bl_block(POST_ARGS) |
|
NULL == n->norm->Bl.width) { |
NULL == n->norm->Bl.width) { |
if ( ! post_bl_block_tag(mdoc)) |
if ( ! post_bl_block_tag(mdoc)) |
return(0); |
return(0); |
|
assert(n->norm->Bl.width); |
} else if (NULL != n->norm->Bl.width) { |
} else if (NULL != n->norm->Bl.width) { |
if ( ! post_bl_block_width(mdoc)) |
if ( ! post_bl_block_width(mdoc)) |
return(0); |
return(0); |
} else |
assert(n->norm->Bl.width); |
return(1); |
} |
|
|
assert(n->norm->Bl.width); |
for (ni = n->body->child; ni; ni = ni->next) { |
|
if (NULL == ni->body) |
|
continue; |
|
nc = ni->body->last; |
|
while (NULL != nc) { |
|
switch (nc->tok) { |
|
case (MDOC_Pp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Lp): |
|
/* FALLTHROUGH */ |
|
case (MDOC_br): |
|
break; |
|
default: |
|
nc = NULL; |
|
continue; |
|
} |
|
if (NULL == ni->next) { |
|
mdoc_nmsg(mdoc, nc, MANDOCERR_MOVEPAR); |
|
if ( ! mdoc_node_relink(mdoc, nc)) |
|
return(0); |
|
} else if (0 == n->norm->Bl.comp && |
|
LIST_column != n->norm->Bl.type) { |
|
mdoc_nmsg(mdoc, nc, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, nc); |
|
} else |
|
break; |
|
nc = ni->body->last; |
|
} |
|
} |
return(1); |
return(1); |
} |
} |
|
|
Line 1563 post_bl_head(POST_ARGS) |
|
Line 1576 post_bl_head(POST_ARGS) |
|
static int |
static int |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *nparent, *nprev; /* of the Bl block */ |
|
struct mdoc_node *nblock, *nbody; /* of the Bl */ |
|
struct mdoc_node *nchild, *nnext; /* of the Bl body */ |
|
|
if (MDOC_HEAD == mdoc->last->type) |
nbody = mdoc->last; |
return(post_bl_head(mdoc)); |
switch (nbody->type) { |
if (MDOC_BLOCK == mdoc->last->type) |
case (MDOC_BLOCK): |
return(post_bl_block(mdoc)); |
return(post_bl_block(mdoc)); |
if (MDOC_BODY != mdoc->last->type) |
case (MDOC_HEAD): |
|
return(post_bl_head(mdoc)); |
|
case (MDOC_BODY): |
|
break; |
|
default: |
return(1); |
return(1); |
|
} |
|
|
for (n = mdoc->last->child; n; n = n->next) { |
nchild = nbody->child; |
switch (n->tok) { |
while (NULL != nchild) { |
case (MDOC_Lp): |
if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) { |
/* FALLTHROUGH */ |
nchild = nchild->next; |
case (MDOC_Pp): |
|
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
|
/* FALLTHROUGH */ |
|
case (MDOC_It): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Sm): |
|
continue; |
continue; |
default: |
|
break; |
|
} |
} |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD); |
return(0); |
|
|
/* |
|
* Move the node out of the Bl block. |
|
* First, collect all required node pointers. |
|
*/ |
|
|
|
nblock = nbody->parent; |
|
nprev = nblock->prev; |
|
nparent = nblock->parent; |
|
nnext = nchild->next; |
|
|
|
/* |
|
* Unlink this child. |
|
*/ |
|
|
|
assert(NULL == nchild->prev); |
|
if (0 == --nbody->nchild) { |
|
nbody->child = NULL; |
|
nbody->last = NULL; |
|
assert(NULL == nnext); |
|
} else { |
|
nbody->child = nnext; |
|
nnext->prev = NULL; |
|
} |
|
|
|
/* |
|
* Relink this child. |
|
*/ |
|
|
|
nchild->parent = nparent; |
|
nchild->prev = nprev; |
|
nchild->next = nblock; |
|
|
|
nblock->prev = nchild; |
|
nparent->nchild++; |
|
if (NULL == nprev) |
|
nparent->child = nchild; |
|
else |
|
nprev->next = nchild; |
|
|
|
nchild = nnext; |
} |
} |
|
|
return(1); |
return(1); |
Line 1607 ebool(struct mdoc *mdoc) |
|
Line 1659 ebool(struct mdoc *mdoc) |
|
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
assert(MDOC_TEXT == mdoc->last->child->type); |
|
|
if (0 == strcmp(mdoc->last->child->string, "on")) |
if (0 == strcmp(mdoc->last->child->string, "on")) { |
|
if (MDOC_Sm == mdoc->last->tok) |
|
mdoc->flags &= ~MDOC_SMOFF; |
return(1); |
return(1); |
if (0 == strcmp(mdoc->last->child->string, "off")) |
} |
|
if (0 == strcmp(mdoc->last->child->string, "off")) { |
|
if (MDOC_Sm == mdoc->last->tok) |
|
mdoc->flags |= MDOC_SMOFF; |
return(1); |
return(1); |
|
} |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL); |
return(1); |
return(1); |
Line 1790 post_rs(POST_ARGS) |
|
Line 1848 post_rs(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* For some arguments of some macros, |
|
* convert all breakable hyphens into ASCII_HYPH. |
|
*/ |
static int |
static int |
|
post_hyph(POST_ARGS) |
|
{ |
|
struct mdoc_node *n, *nch; |
|
char *cp; |
|
|
|
n = mdoc->last; |
|
switch (n->type) { |
|
case (MDOC_HEAD): |
|
if (MDOC_Sh == n->tok || MDOC_Ss == n->tok) |
|
break; |
|
return(1); |
|
case (MDOC_BODY): |
|
if (MDOC_D1 == n->tok || MDOC_Nd == n->tok) |
|
break; |
|
return(1); |
|
case (MDOC_ELEM): |
|
break; |
|
default: |
|
return(1); |
|
} |
|
|
|
for (nch = n->child; nch; nch = nch->next) { |
|
if (MDOC_TEXT != nch->type) |
|
continue; |
|
cp = nch->string; |
|
if ('\0' == *cp) |
|
continue; |
|
while ('\0' != *(++cp)) |
|
if ('-' == *cp && |
|
isalpha((unsigned char)cp[-1]) && |
|
isalpha((unsigned char)cp[1])) |
|
*cp = ASCII_HYPH; |
|
} |
|
return(1); |
|
} |
|
|
|
static int |
post_ns(POST_ARGS) |
post_ns(POST_ARGS) |
{ |
{ |
|
|
Line 1849 post_sh_body(POST_ARGS) |
|
Line 1948 post_sh_body(POST_ARGS) |
|
static int |
static int |
post_sh_head(POST_ARGS) |
post_sh_head(POST_ARGS) |
{ |
{ |
char buf[BUFSIZ]; |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
|
const char *secname; |
enum mdoc_sec sec; |
enum mdoc_sec sec; |
int c; |
|
|
|
/* |
/* |
* Process a new section. Sections are either "named" or |
* Process a new section. Sections are either "named" or |
Line 1861 post_sh_head(POST_ARGS) |
|
Line 1959 post_sh_head(POST_ARGS) |
|
* manual sections. |
* manual sections. |
*/ |
*/ |
|
|
|
secname = NULL; |
sec = SEC_CUSTOM; |
sec = SEC_CUSTOM; |
buf[0] = '\0'; |
n = mdoc->last; |
if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) { |
if (n->child) { |
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
assert(1 == n->nchild); |
return(0); |
n = n->child; |
} else if (1 == c) |
assert(NULL != n); |
sec = a2sec(buf); |
assert(MDOC_TEXT == n->type); |
|
secname = n->string; |
|
sec = a2sec(secname); |
|
} |
|
|
/* The NAME should be first. */ |
/* The NAME should be first. */ |
|
|
Line 1876 post_sh_head(POST_ARGS) |
|
Line 1978 post_sh_head(POST_ARGS) |
|
|
|
/* The SYNOPSIS gets special attention in other areas. */ |
/* The SYNOPSIS gets special attention in other areas. */ |
|
|
if (SEC_SYNOPSIS == sec) |
if (SEC_SYNOPSIS == sec) { |
|
roff_setreg(mdoc->roff, "nS", 1, '='); |
mdoc->flags |= MDOC_SYNOPSIS; |
mdoc->flags |= MDOC_SYNOPSIS; |
else |
} else { |
|
roff_setreg(mdoc->roff, "nS", 0, '='); |
mdoc->flags &= ~MDOC_SYNOPSIS; |
mdoc->flags &= ~MDOC_SYNOPSIS; |
|
} |
|
|
/* Mark our last section. */ |
/* Mark our last section. */ |
|
|
Line 1924 post_sh_head(POST_ARGS) |
|
Line 2029 post_sh_head(POST_ARGS) |
|
assert(mdoc->meta.msec); |
assert(mdoc->meta.msec); |
|
|
switch (sec) { |
switch (sec) { |
case (SEC_RETURN_VALUES): |
|
/* FALLTHROUGH */ |
|
case (SEC_ERRORS): |
case (SEC_ERRORS): |
|
if (*mdoc->meta.msec == '4') |
|
break; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case (SEC_RETURN_VALUES): |
|
/* FALLTHROUGH */ |
case (SEC_LIBRARY): |
case (SEC_LIBRARY): |
if (*mdoc->meta.msec == '2') |
if (*mdoc->meta.msec == '2') |
break; |
break; |
Line 1935 post_sh_head(POST_ARGS) |
|
Line 2042 post_sh_head(POST_ARGS) |
|
break; |
break; |
if (*mdoc->meta.msec == '9') |
if (*mdoc->meta.msec == '9') |
break; |
break; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC); |
mandoc_msg(MANDOCERR_SECMSEC, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, secname); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 2056 pre_literal(PRE_ARGS) |
|
Line 2164 pre_literal(PRE_ARGS) |
|
static int |
static int |
post_dd(POST_ARGS) |
post_dd(POST_ARGS) |
{ |
{ |
char buf[DATESIZE]; |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
int c; |
char *datestr; |
|
|
if (mdoc->meta.date) |
if (mdoc->meta.date) |
free(mdoc->meta.date); |
free(mdoc->meta.date); |
|
|
n = mdoc->last; |
n = mdoc->last; |
if (NULL == n->child || '\0' == n->child->string[0]) { |
if (NULL == n->child || '\0' == n->child->string[0]) { |
mdoc->meta.date = mandoc_normdate |
mdoc->meta.date = mdoc->quick ? mandoc_strdup("") : |
(mdoc->parse, NULL, n->line, n->pos); |
mandoc_normdate(mdoc->parse, NULL, n->line, n->pos); |
return(1); |
return(1); |
} |
} |
|
|
buf[0] = '\0'; |
datestr = NULL; |
if (-1 == (c = concat(buf, n->child, DATESIZE))) { |
mdoc_deroff(&datestr, n); |
mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM); |
if (mdoc->quick) |
return(0); |
mdoc->meta.date = datestr; |
|
else { |
|
mdoc->meta.date = mandoc_normdate(mdoc->parse, |
|
datestr, n->line, n->pos); |
|
free(datestr); |
} |
} |
|
|
assert(c); |
|
mdoc->meta.date = mandoc_normdate |
|
(mdoc->parse, buf, n->line, n->pos); |
|
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 2176 post_dt(POST_ARGS) |
|
Line 2282 post_dt(POST_ARGS) |
|
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.vol = mandoc_strdup(cp); |
} else { |
} else { |
/* FIXME: warn about bad arch. */ |
|
cp = mdoc_a2arch(nn->string); |
cp = mdoc_a2arch(nn->string); |
if (NULL == cp) { |
if (NULL == cp) { |
|
mdoc_nmsg(mdoc, nn, MANDOCERR_BADVOLARCH); |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
} else |
} else |
Line 2229 post_bx(POST_ARGS) |
|
Line 2335 post_bx(POST_ARGS) |
|
static int |
static int |
post_os(POST_ARGS) |
post_os(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
|
char buf[BUFSIZ]; |
|
int c; |
|
#ifndef OSNAME |
#ifndef OSNAME |
struct utsname utsname; |
struct utsname utsname; |
|
static char *defbuf; |
#endif |
#endif |
|
struct mdoc_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
Line 2248 post_os(POST_ARGS) |
|
Line 2353 post_os(POST_ARGS) |
|
*/ |
*/ |
|
|
free(mdoc->meta.os); |
free(mdoc->meta.os); |
|
mdoc->meta.os = NULL; |
|
mdoc_deroff(&mdoc->meta.os, n); |
|
if (mdoc->meta.os) |
|
return(1); |
|
|
buf[0] = '\0'; |
if (mdoc->defos) { |
if (-1 == (c = concat(buf, n->child, BUFSIZ))) { |
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM); |
return(1); |
return(0); |
|
} |
} |
|
|
assert(c); |
|
|
|
if ('\0' == buf[0]) { |
|
if (mdoc->defos) { |
|
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
|
return(1); |
|
} |
|
#ifdef OSNAME |
#ifdef OSNAME |
if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) { |
mdoc->meta.os = mandoc_strdup(OSNAME); |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
|
return(0); |
|
} |
|
#else /*!OSNAME */ |
#else /*!OSNAME */ |
|
if (NULL == defbuf) { |
if (-1 == uname(&utsname)) { |
if (-1 == uname(&utsname)) { |
mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); |
mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); |
mdoc->meta.os = mandoc_strdup("UNKNOWN"); |
defbuf = mandoc_strdup("UNKNOWN"); |
return(post_prol(mdoc)); |
} else |
} |
mandoc_asprintf(&defbuf, "%s %s", |
|
utsname.sysname, utsname.release); |
if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
|
return(0); |
|
} |
|
if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
|
return(0); |
|
} |
|
if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
|
return(0); |
|
} |
|
#endif /*!OSNAME*/ |
|
} |
} |
|
mdoc->meta.os = mandoc_strdup(defbuf); |
mdoc->meta.os = mandoc_strdup(buf); |
#endif /*!OSNAME*/ |
return(1); |
return(1); |
} |
} |
|
|
Line 2319 post_std(POST_ARGS) |
|
Line 2405 post_std(POST_ARGS) |
|
return(0); |
return(0); |
|
|
mdoc->last = nn; |
mdoc->last = nn; |
return(1); |
|
} |
|
|
|
/* |
|
* Concatenate a node, stopping at the first non-text. |
|
* Concatenation is separated by a single whitespace. |
|
* Returns -1 on fatal (string overrun) error, 0 if child nodes were |
|
* encountered, 1 otherwise. |
|
*/ |
|
static int |
|
concat(char *p, const struct mdoc_node *n, size_t sz) |
|
{ |
|
|
|
for ( ; NULL != n; n = n->next) { |
|
if (MDOC_TEXT != n->type) |
|
return(0); |
|
if ('\0' != p[0] && strlcat(p, " ", sz) >= sz) |
|
return(-1); |
|
if (strlcat(p, n->string, sz) >= sz) |
|
return(-1); |
|
concat(p, n->child, sz); |
|
} |
|
|
|
return(1); |
return(1); |
} |
} |
|
|