Christian Weisgerber wrote on Sat, Apr 03, 2010 at 03:11:26AM +0200:

> misc/omconsole
>   omconsole.1:36:5: error: requires line arguments > 0 (has 0)

That's a bad syntax error in the mdoc(7) source code.
Matthieu should really fix it upstream.
Just remove the .Xr having no argument!

Still, mandoc(1) need not die, we can just ignore the empty .Xr macro.

OK?


Remaining:

> net/bluetooth-tools
>   btkey.1:123:2: error: bad child for parent context
> net/openvpn_bsdauth
>   openvpn_bsdauth.8:22:16: error: multi-line scope breaks multi-line
>   scope of Xo
> net/ipcalc
>   ipcalc.1:70:2: error: multi-line scope breaks multi-line scope of It
> sysutils/pftop
>   pftop.8:146:2: error: multi-line scope breaks multi-line scope of It
> sysutils/login_ldap
>   login_ldap.8:283:2: error: multi-line scope breaks multi-line scope of
>   It
> sysutils/login_fingerprint
>   login_fingerprint.8:72:2: error: multi-line scope breaks multi-line
>   scope of It


Index: mdoc_html.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/mdoc_html.c,v
retrieving revision 1.8
diff -u -p -r1.8 mdoc_html.c
--- mdoc_html.c 2 Mar 2010 00:38:59 -0000       1.8
+++ mdoc_html.c 3 Apr 2010 16:55:13 -0000
@@ -753,6 +753,9 @@ mdoc_xr_pre(MDOC_ARGS)
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 
+       if (NULL == n->child)
+               return(0);
+
        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
Index: mdoc_term.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.71
diff -u -p -r1.71 mdoc_term.c
--- mdoc_term.c 26 Mar 2010 01:22:05 -0000      1.71
+++ mdoc_term.c 3 Apr 2010 16:55:18 -0000
@@ -1275,7 +1275,10 @@ termp_xr_pre(DECL_ARGS)
 {
        const struct mdoc_node *nn;
 
-       assert(n->child && MDOC_TEXT == n->child->type);
+       if (NULL == n->child)
+               return(0);
+
+       assert(MDOC_TEXT == n->child->type);
        nn = n->child;
 
        term_word(p, nn->string);
Index: mdoc_validate.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.46
diff -u -p -r1.46 mdoc_validate.c
--- mdoc_validate.c     3 Apr 2010 16:30:42 -0000       1.46
+++ mdoc_validate.c     3 Apr 2010 16:55:20 -0000
@@ -129,7 +129,7 @@ static      v_post   posts_text1[] = { eerr_eq
 static v_post   posts_vt[] = { post_vt, NULL };
 static v_post   posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static v_post   posts_wtext[] = { ewarn_ge1, NULL };
-static v_post   posts_xr[] = { eerr_ge1, NULL };
+static v_post   posts_xr[] = { ewarn_ge1, NULL };
 static v_pre    pres_an[] = { pre_an, NULL };
 static v_pre    pres_bd[] = { pre_display, pre_bd, NULL };
 static v_pre    pres_bl[] = { pre_bl, NULL };

Reply via email to