Moved output definitions into main.h.

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index df9cb5f0af50859f9e3e422ebdac7b643d91dc8b..6ca7f9e2b8f20a3a0cecf1011664dc35d1491117 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,4 +1,4 @@
-/*     $Id: man_action.c,v 1.12 2009/06/16 19:55:28 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.19 2009/08/22 09:10:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -23,17 +23,13 @@
 
 #include "libman.h"
 
-#ifdef __linux__
-extern char            *strptime(const char *, const char *, struct tm *);
-#endif
-
 struct actions {
        int     (*post)(struct man *);
 };
 
-
 static int       post_TH(struct man *);
-static time_t    man_atotime(const char *);
+static int       post_fi(struct man *);
+static int       post_nf(struct man *);
 
 const  struct actions man_actions[MAN_MAX] = {
        { NULL }, /* br */
@@ -59,8 +55,21 @@ const        struct actions man_actions[MAN_MAX] = {
        { NULL }, /* RI */
        { NULL }, /* na */
        { NULL }, /* i */
+       { NULL }, /* sp */
+       { post_nf }, /* nf */
+       { post_fi }, /* fi */
+       { NULL }, /* r */
+       { NULL }, /* RE */
+       { NULL }, /* RS */
+       { NULL }, /* DT */
+       { NULL }, /* UC */
 };
 
+static time_t    man_atotime(const char *);
+#ifdef __linux__
+extern char     *strptime(const char *, const char *, struct tm *);
+#endif
+
 
 int
 man_action_post(struct man *m)
@@ -72,14 +81,39 @@ man_action_post(struct man *m)
 
        switch (m->last->type) {
        case (MAN_TEXT):
-               break;
+               /* FALLTHROUGH */
        case (MAN_ROOT):
-               break;
+               return(1);
        default:
-               if (NULL == man_actions[m->last->tok].post)
-                       break;
-               return((*man_actions[m->last->tok].post)(m));
+               break;
        }
+
+       if (NULL == man_actions[m->last->tok].post)
+               return(1);
+       return((*man_actions[m->last->tok].post)(m));
+}
+
+
+static int
+post_fi(struct man *m)
+{
+
+       if ( ! (MAN_LITERAL & m->flags))
+               if ( ! man_nwarn(m, m->last, WNLITERAL))
+                       return(0);
+       m->flags &= ~MAN_LITERAL;
+       return(1);
+}
+
+
+static int
+post_nf(struct man *m)
+{
+
+       if (MAN_LITERAL & m->flags)
+               if ( ! man_nwarn(m, m->last, WOLITERAL))
+                       return(0);
+       m->flags |= MAN_LITERAL;
        return(1);
 }
 
@@ -108,8 +142,7 @@ post_TH(struct man *m)
        assert(n);
 
        if (NULL == (m->meta.title = strdup(n->string)))
-               return(man_verr(m, n->line, n->pos, 
-                                       "memory exhausted"));
+               return(man_nerr(m, n, WNMEM));
 
        /* TITLE ->MSEC<- DATE SOURCE VOL */
 
@@ -120,7 +153,7 @@ post_TH(struct man *m)
        lval = strtol(n->string, &ep, 10);
        if (n->string[0] != '\0' && *ep == '\0')
                m->meta.msec = (int)lval;
-       else if ( ! man_vwarn(m, n->line, n->pos, "invalid section"))
+       else if ( ! man_nwarn(m, n, WMSEC))
                return(0);
 
        /* TITLE MSEC ->DATE<- SOURCE VOL */
@@ -128,7 +161,7 @@ post_TH(struct man *m)
        if (NULL == (n = n->next))
                m->meta.date = time(NULL);
        else if (0 == (m->meta.date = man_atotime(n->string))) {
-               if ( ! man_vwarn(m, n->line, n->pos, "invalid date"))
+               if ( ! man_nwarn(m, n, WDATE))
                        return(0);
                m->meta.date = time(NULL);
        }
@@ -137,15 +170,13 @@ post_TH(struct man *m)
 
        if (n && (n = n->next))
                if (NULL == (m->meta.source = strdup(n->string)))
-                       return(man_verr(m, n->line, n->pos, 
-                                               "memory exhausted"));
+                       return(man_nerr(m, n, WNMEM));
 
        /* TITLE MSEC DATE SOURCE ->VOL<- */
 
        if (n && (n = n->next))
                if (NULL == (m->meta.vol = strdup(n->string)))
-                       return(man_verr(m, n->line, n->pos, 
-                                               "memory exhausted"));
+                       return(man_nerr(m, n, WNMEM));
 
        /* 
         * The end document shouldn't have the prologue macros as part
@@ -153,12 +184,10 @@ post_TH(struct man *m)
         */
 
        if (m->last->parent->child == m->last) {
-               assert(MAN_ROOT == m->last->parent->type);
                m->last->parent->child = NULL;
                n = m->last;
                m->last = m->last->parent;
                m->next = MAN_NEXT_CHILD;
-               assert(m->last == m->first);
        } else {
                assert(m->last->prev);
                m->last->prev->next = NULL;
@@ -178,7 +207,7 @@ man_atotime(const char *p)
        struct tm        tm;
        char            *pp;
 
-       (void)memset(&tm, 0, sizeof(struct tm));
+       bzero(&tm, sizeof(struct tm));
 
        if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
                return(mktime(&tm));