Do not dereference a NULL pointer if a .Bl macro has

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index ebad7c775661b2313814fe5c7352013233337de1..2a93de63be3245edb33bc6d0f4d59b6edf2f09d4 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,6 +1,6 @@
-/*     $Id: tbl_html.c,v 1.6 2011/01/11 14:12:01 kristaps Exp $ */
+/*     $Id: tbl_html.c,v 1.12 2014/08/10 23:54:41 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,9 +14,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -27,18 +27,18 @@
 #include "out.h"
 #include "html.h"
 
+static void     html_tblopen(struct html *, const struct tbl_span *);
 static size_t   html_tbl_len(size_t, void *);
 static size_t   html_tbl_strlen(const char *, void *);
 
-/* ARGSUSED */
+
 static size_t
 html_tbl_len(size_t sz, void *arg)
 {
-       
+
        return(sz);
 }
 
-/* ARGSUSED */
 static size_t
 html_tbl_strlen(const char *p, void *arg)
 {
@@ -46,89 +46,97 @@ html_tbl_strlen(const char *p, void *arg)
        return(strlen(p));
 }
 
+static void
+html_tblopen(struct html *h, const struct tbl_span *sp)
+{
+       const struct tbl_head *hp;
+       struct htmlpair  tag;
+       struct roffsu    su;
+       struct roffcol  *col;
+
+       if (TBL_SPAN_FIRST & sp->flags) {
+               h->tbl.len = html_tbl_len;
+               h->tbl.slen = html_tbl_strlen;
+               tblcalc(&h->tbl, sp);
+       }
+
+       assert(NULL == h->tblt);
+       PAIR_CLASS_INIT(&tag, "tbl");
+       h->tblt = print_otag(h, TAG_TABLE, 1, &tag);
+
+       for (hp = sp->head; hp; hp = hp->next) {
+               bufinit(h);
+               col = &h->tbl.cols[hp->ident];
+               SCALE_HS_INIT(&su, col->width);
+               bufcat_su(h, "width", &su);
+               PAIR_STYLE_INIT(&tag, h);
+               print_otag(h, TAG_COL, 1, &tag);
+       }
+
+       print_otag(h, TAG_TBODY, 0, NULL);
+}
+
+void
+print_tblclose(struct html *h)
+{
+
+       assert(h->tblt);
+       print_tagq(h, h->tblt);
+       h->tblt = NULL;
+}
+
 void
 print_tbl(struct html *h, const struct tbl_span *sp)
 {
        const struct tbl_head *hp;
        const struct tbl_dat *dp;
-       struct tag      *tt;
        struct htmlpair  tag;
-       struct roffsu    su;
-       struct roffcol  *col;
+       struct tag      *tt;
 
        /* Inhibit printing of spaces: we do padding ourselves. */
 
+       if (NULL == h->tblt)
+               html_tblopen(h, sp);
+
+       assert(h->tblt);
+
        h->flags |= HTML_NONOSPACE;
        h->flags |= HTML_NOSPACE;
 
-       /* First pass: calculate widths. */
-
-       if (TBL_SPAN_FIRST & sp->flags) {
-               h->tbl.len = html_tbl_len;
-               h->tbl.slen = html_tbl_strlen;
-               tblcalc(&h->tbl, sp);
-       }
+       tt = print_otag(h, TAG_TR, 0, NULL);
 
        switch (sp->pos) {
-       case (TBL_SPAN_HORIZ):
+       case TBL_SPAN_HORIZ:
                /* FALLTHROUGH */
-       case (TBL_SPAN_DHORIZ):
+       case TBL_SPAN_DHORIZ:
+               PAIR_INIT(&tag, ATTR_COLSPAN, "0");
+               print_otag(h, TAG_TD, 1, &tag);
                break;
        default:
-               PAIR_CLASS_INIT(&tag, "tbl");
-               print_otag(h, TAG_TABLE, 1, &tag);
-               print_otag(h, TAG_TR, 0, NULL);
-
-               /* Iterate over template headers. */
-
                dp = sp->first;
                for (hp = sp->head; hp; hp = hp->next) {
-                       switch (hp->pos) {
-                       case (TBL_HEAD_VERT):
-                               /* FALLTHROUGH */
-                       case (TBL_HEAD_DVERT):
-                               continue;
-                       case (TBL_HEAD_DATA):
+                       print_stagq(h, tt);
+                       print_otag(h, TAG_TD, 0, NULL);
+
+                       if (NULL == dp)
                                break;
-                       }
-
-                       /*
-                        * For the time being, use the simplest possible
-                        * table styling: setting the widths of data
-                        * columns.
-                        */
-
-                       col = &h->tbl.cols[hp->ident];
-                       SCALE_HS_INIT(&su, col->width);
-                       bufcat_su(h, "width", &su);
-                       PAIR_STYLE_INIT(&tag, h);
-                       tt = print_otag(h, TAG_TD, 1, &tag);
-
-                       if (dp) {
-                               switch (dp->layout->pos) {
-                               case (TBL_CELL_DOWN):
-                                       break;
-                               default:
-                                       if (NULL == dp->string)
-                                               break;
+                       if (TBL_CELL_DOWN != dp->layout->pos)
+                               if (dp->string)
                                        print_text(h, dp->string);
-                                       break;
-                               }
-                               dp = dp->next;
-                       }
-
-                       print_tagq(h, tt);
+                       dp = dp->next;
                }
                break;
        }
 
-       h->flags &= ~HTML_NONOSPACE;
+       print_tagq(h, tt);
 
-       /* Close out column specifiers on the last span. */
+       h->flags &= ~HTML_NONOSPACE;
 
        if (TBL_SPAN_LAST & sp->flags) {
                assert(h->tbl.cols);
                free(h->tbl.cols);
                h->tbl.cols = NULL;
+               print_tblclose(h);
        }
+
 }