Using man_node_delete() instead of man_node_free()/man_node_freelist() and friends...

[mandoc.git] / man_action.c

diff --git a/man_action.c b/man_action.c
index 8730892f9ad4e27c8740ba43119bf718fed087ed..53f79b3bbbb17d4088baf019647431f4d9762d3d 100644 (file)
--- a/man_action.c
+++ b/man_action.c
@@ -1,4 +1,4 @@
-/*     $Id: man_action.c,v 1.20 2009/10/24 05:45:04 kristaps Exp $ */
+/*     $Id: man_action.c,v 1.29 2010/03/24 20:10:53 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,20 +14,23 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#include <sys/utsname.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 
 #include <assert.h>
 
 #include <assert.h>

-#include <errno.h>

 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"
 #include <stdlib.h>
 #include <string.h>
 
 #include "libman.h"

+#include "libmandoc.h"

 
 struct actions {
        int     (*post)(struct man *);
 };
 
 static int       post_TH(struct man *);
 
 struct actions {
        int     (*post)(struct man *);
 };
 
 static int       post_TH(struct man *);

+static int       post_de(struct man *);

 static int       post_fi(struct man *);
 static int       post_nf(struct man *);
 
 static int       post_fi(struct man *);
 static int       post_nf(struct man *);
 


@@ -64,13 +67,17 @@ const       struct actions man_actions[MAN_MAX] = {
        { NULL }, /* DT */
        { NULL }, /* UC */
        { NULL }, /* PD */
        { NULL }, /* DT */
        { NULL }, /* UC */
        { NULL }, /* PD */

+       { NULL }, /* Sp */
+       { post_nf }, /* Vb */
+       { post_fi }, /* Ve */
+       { post_de }, /* de */
+       { post_de }, /* dei */
+       { post_de }, /* am */
+       { post_de }, /* ami */
+       { post_de }, /* ig */
+       { NULL }, /* . */

 };
 
 };
 

-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)
 
 int
 man_action_post(struct man *m)


@@ -107,6 +114,21 @@ post_fi(struct man *m)
 }
 
 
 }
 
 

+static int
+post_de(struct man *m)
+{
+
+       /*
+        * XXX: for the time being, we indiscriminately remove roff
+        * instructions from the parse stream.
+        */
+       if (MAN_BLOCK == m->last->type)
+               man_node_delete(m, m->last);
+
+       return(1);
+}
+
+

 static int
 post_nf(struct man *m)
 {
 static int
 post_nf(struct man *m)
 {


@@ -141,16 +163,13 @@ post_TH(struct man *m)
 
        n = m->last->child;
        assert(n);
 
        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);
 
 
        /* 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;
        lval = strtol(n->string, &ep, 10);
        if (n->string[0] != '\0' && *ep == '\0')
                m->meta.msec = (int)lval;


@@ -159,65 +178,33 @@ post_TH(struct man *m)
 
        /* TITLE MSEC ->DATE<- SOURCE VOL */
 
 
        /* 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);
                m->meta.date = time(NULL);

-       }

 
        /* TITLE MSEC DATE ->SOURCE<- VOL */
 
        if (n && (n = n->next))
 
        /* 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))
 
        /* 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
-        * of the syntax tree (they encompass only meta-data).  
+       /*
+        * Remove the `TH' node after we've processed it for our
+        * meta-data.

         */
         */

-
-       if (m->last->parent->child == m->last) {
-               m->last->parent->child = NULL;
-               n = m->last;
-               m->last = m->last->parent;
-               m->next = MAN_NEXT_CHILD;
-       } else {
-               assert(m->last->prev);
-               m->last->prev->next = NULL;
-               n = m->last;
-               m->last = m->last->prev;
-               m->next = MAN_NEXT_SIBLING;
-       }
-
-       man_node_freelist(n);
+       man_node_delete(m, m->last);

        return(1);
 }
        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);
-}