Made `Xr' compatible with groff calling conventions where arguments following the

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index 38ac684d7c85214e46f4865d082f7e6719226238..2b8eba9fc557a21a4759378c952d73f796e59c8c 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,4 +1,4 @@
-/*     $Id: man_action.c,v 1.16 2009/08/19 09:14:50 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.25 2010/01/01 17:14:27 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,26 +14,26 @@
  * 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/utsname.h>
 
 #include <assert.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"
-
-#ifdef __linux__
-extern char            *strptime(const char *, const char *, struct tm *);
-#endif
+#include "libmandoc.h"
 
 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 */
@@ -60,11 +60,14 @@ const       struct actions man_actions[MAN_MAX] = {
        { NULL }, /* na */
        { NULL }, /* i */
        { NULL }, /* sp */
-       { NULL }, /* nf */
-       { NULL }, /* fi */
+       { post_nf }, /* nf */
+       { post_fi }, /* fi */
        { NULL }, /* r */
        { NULL }, /* RE */
        { NULL }, /* RS */
+       { NULL }, /* DT */
+       { NULL }, /* UC */
+       { NULL }, /* PD */
 };
 
 
@@ -78,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);
 }
 
@@ -112,16 +140,13 @@ post_TH(struct man *m)
 
        n = m->last->child;
        assert(n);
-
-       if (NULL == (m->meta.title = strdup(n->string)))
-               return(man_nerr(m, n, WNMEM));
+       m->meta.title = mandoc_strdup(n->string);
 
        /* TITLE ->MSEC<- DATE SOURCE VOL */
 
        n = n->next;
        assert(n);
 
-       errno = 0;
        lval = strtol(n->string, &ep, 10);
        if (n->string[0] != '\0' && *ep == '\0')
                m->meta.msec = (int)lval;
@@ -130,25 +155,28 @@ post_TH(struct man *m)
 
        /* TITLE MSEC ->DATE<- SOURCE VOL */
 
-       if (NULL == (n = n->next))
-               m->meta.date = time(NULL);
-       else if (0 == (m->meta.date = man_atotime(n->string))) {
-               if ( ! man_nwarn(m, n, WDATE))
-                       return(0);
+       n = n->next;
+       if (n) {
+               m->meta.date = mandoc_a2time
+                       (MTIME_ISO_8601, n->string);
+
+               if (0 == m->meta.date) {
+                       if ( ! man_nwarn(m, n, WDATE))
+                               return(0);
+                       m->meta.date = time(NULL);
+               }
+       } else
                m->meta.date = time(NULL);
-       }
 
        /* TITLE MSEC DATE ->SOURCE<- VOL */
 
        if (n && (n = n->next))
-               if (NULL == (m->meta.source = strdup(n->string)))
-                       return(man_nerr(m, n, WNMEM));
+               m->meta.source = mandoc_strdup(n->string);
 
        /* TITLE MSEC DATE SOURCE ->VOL<- */
 
        if (n && (n = n->next))
-               if (NULL == (m->meta.vol = strdup(n->string)))
-                       return(man_nerr(m, n, WNMEM));
+               m->meta.vol = mandoc_strdup(n->string);
 
        /* 
         * The end document shouldn't have the prologue macros as part
@@ -171,24 +199,3 @@ post_TH(struct man *m)
        man_node_freelist(n);
        return(1);
 }
-
-
-static time_t
-man_atotime(const char *p)
-{
-       struct tm        tm;
-       char            *pp;
-
-       bzero(&tm, sizeof(struct tm));
-
-       if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-       if ((pp = strptime(p, "%d %b %Y", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-       if ((pp = strptime(p, "%b %d, %Y", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-       if ((pp = strptime(p, "%b %Y", &tm)) && 0 == *pp)
-               return(mktime(&tm));
-
-       return(0);
-}