diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-11-29 14:50:33 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-11-29 14:50:33 +0000 |
| commit | 81280424219ca468fec2fafeedd0eaaf6938c2fc (patch) | |
| tree | e883d95383e1de6a04fb24247aa3af1913ec7c68 /mdoc_validate.c | |
| parent | 13d6d1a03535bf46442e276fc77a2f4ed9e14fc9 (diff) | |
| download | mandoc-81280424219ca468fec2fafeedd0eaaf6938c2fc.tar.gz | |
Move `At' handling from mdoc_action.c into mdoc_validate.c.
Diffstat (limited to 'mdoc_validate.c')
| -rw-r--r-- | mdoc_validate.c | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/mdoc_validate.c b/mdoc_validate.c index f5ed9987..21db9889 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -112,7 +112,7 @@ static int pre_sh(PRE_ARGS); static int pre_ss(PRE_ARGS); static v_post posts_an[] = { post_an, NULL }; -static v_post posts_at[] = { post_at, NULL }; +static v_post posts_at[] = { post_at, post_defaults, NULL }; static v_post posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; @@ -1159,6 +1159,12 @@ post_defaults(POST_ARGS) if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "...")) return(0); break; + case (MDOC_At): + if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "AT&T")) + return(0); + if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "UNIX")) + return(0); + break; case (MDOC_Li): if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "")) return(0); @@ -1179,15 +1185,39 @@ post_defaults(POST_ARGS) static int post_at(POST_ARGS) { + const char *p, *q; + char *buf; + size_t sz; + /* + * If we have a child, look it up in the standard keys. If a + * key exist, use that instead of the child; if it doesn't, + * prefix "AT&T UNIX " to the existing data. + */ + if (NULL == mdoc->last->child) return(1); + assert(MDOC_TEXT == mdoc->last->child->type); - if (mdoc_a2att(mdoc->last->child->string)) - return(1); - return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT)); -} + p = mdoc_a2att(mdoc->last->child->string); + + if (p) { + free(mdoc->last->child->string); + mdoc->last->child->string = mandoc_strdup(p); + } else { + mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT); + p = "AT&T UNIX "; + q = mdoc->last->child->string; + sz = strlen(p) + strlen(q) + 1; + buf = mandoc_malloc(sz); + strlcpy(buf, p, sz); + strlcat(buf, q, sz); + free(mdoc->last->child->string); + mdoc->last->child->string = buf; + } + return(1); +} static int post_an(POST_ARGS) |