version 1.338, 2017/06/11 20:03:02 |
version 1.340, 2017/06/24 14:38:33 |
Line 1709 post_bl(POST_ARGS) |
|
Line 1709 post_bl(POST_ARGS) |
|
nchild = nnext; |
nchild = nnext; |
} |
} |
|
|
if (mdoc->meta.os_e != MDOC_OS_NETBSD) |
if (mdoc->meta.os_e != MANDOC_OS_NETBSD) |
return; |
return; |
|
|
prev_Er = NULL; |
prev_Er = NULL; |
Line 1728 post_bl(POST_ARGS) |
|
Line 1728 post_bl(POST_ARGS) |
|
if (order > 0) |
if (order > 0) |
mandoc_vmsg(MANDOCERR_ER_ORDER, |
mandoc_vmsg(MANDOCERR_ER_ORDER, |
mdoc->parse, nnext->line, nnext->pos, |
mdoc->parse, nnext->line, nnext->pos, |
"Er %s %s", prev_Er, nnext->string); |
"Er %s %s (NetBSD)", |
|
prev_Er, nnext->string); |
else if (order == 0) |
else if (order == 0) |
mandoc_vmsg(MANDOCERR_ER_REP, |
mandoc_vmsg(MANDOCERR_ER_REP, |
mdoc->parse, nnext->line, nnext->pos, |
mdoc->parse, nnext->line, nnext->pos, |
"Er %s", prev_Er); |
"Er %s (NetBSD)", prev_Er); |
} |
} |
prev_Er = nnext->string; |
prev_Er = nnext->string; |
} |
} |
Line 1806 post_root(POST_ARGS) |
|
Line 1807 post_root(POST_ARGS) |
|
mandoc_msg(MANDOCERR_OS_MISSING, |
mandoc_msg(MANDOCERR_OS_MISSING, |
mdoc->parse, 0, 0, NULL); |
mdoc->parse, 0, 0, NULL); |
mdoc->meta.os = mandoc_strdup(""); |
mdoc->meta.os = mandoc_strdup(""); |
} |
} else if (mdoc->meta.os_e && |
|
(mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0) |
|
mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0, |
|
mdoc->meta.os_e == MANDOC_OS_OPENBSD ? |
|
"(OpenBSD)" : "(NetBSD)"); |
|
|
/* Check that we begin with a proper `Sh'. */ |
/* Check that we begin with a proper `Sh'. */ |
|
|
Line 2545 post_os(POST_ARGS) |
|
Line 2550 post_os(POST_ARGS) |
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
goto out; |
goto out; |
|
|
if (mdoc->defos) { |
if (mdoc->os_s != NULL) { |
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
mdoc->meta.os = mandoc_strdup(mdoc->os_s); |
goto out; |
goto out; |
} |
} |
|
|
Line 2565 post_os(POST_ARGS) |
|
Line 2570 post_os(POST_ARGS) |
|
mdoc->meta.os = mandoc_strdup(defbuf); |
mdoc->meta.os = mandoc_strdup(defbuf); |
#endif /*!OSNAME*/ |
#endif /*!OSNAME*/ |
|
|
out: mdoc->meta.os_e = strstr(mdoc->meta.os, "OpenBSD") != NULL ? |
out: |
MDOC_OS_OPENBSD : strstr(mdoc->meta.os, "NetBSD") != NULL ? |
if (mdoc->meta.os_e == MANDOC_OS_OTHER) { |
MDOC_OS_NETBSD : MDOC_OS_OTHER; |
if (strstr(mdoc->meta.os, "OpenBSD") != NULL) |
|
mdoc->meta.os_e = MANDOC_OS_OPENBSD; |
|
else if (strstr(mdoc->meta.os, "NetBSD") != NULL) |
|
mdoc->meta.os_e = MANDOC_OS_NETBSD; |
|
} |
|
|
/* |
/* |
* This is the earliest point where we can check |
* This is the earliest point where we can check |
Line 2581 out: mdoc->meta.os_e = strstr(mdoc->meta.os, "OpenBSD" |
|
Line 2590 out: mdoc->meta.os_e = strstr(mdoc->meta.os, "OpenBSD" |
|
if ((n = n->child) == NULL) |
if ((n = n->child) == NULL) |
return; |
return; |
if (strncmp(n->string, "$" "Mdocdate", 9)) { |
if (strncmp(n->string, "$" "Mdocdate", 9)) { |
if (mdoc->meta.os_e == MDOC_OS_OPENBSD) |
if (mdoc->meta.os_e == MANDOC_OS_OPENBSD) |
mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING, |
mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"Dd %s", n->string); |
"Dd %s (OpenBSD)", n->string); |
} else { |
} else { |
if (mdoc->meta.os_e == MDOC_OS_NETBSD) |
if (mdoc->meta.os_e == MANDOC_OS_NETBSD) |
mandoc_vmsg(MANDOCERR_MDOCDATE, |
mandoc_vmsg(MANDOCERR_MDOCDATE, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"Dd %s", n->string); |
"Dd %s (NetBSD)", n->string); |
} |
} |
} |
} |
|
|