===================================================================
RCS file: /cvs/mandoc/Attic/man_action.c,v
retrieving revision 1.12
retrieving revision 1.43
diff -u -p -r1.12 -r1.43
--- mandoc/Attic/man_action.c	2009/06/16 19:55:28	1.12
+++ mandoc/Attic/man_action.c	2010/11/30 15:24:27	1.43
@@ -1,6 +1,6 @@
-/*	$Id: man_action.c,v 1.12 2009/06/16 19:55:28 kristaps Exp $ */
+/*	$Id: man_action.c,v 1.43 2010/11/30 15:24:27 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 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,30 +14,26 @@
  * 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 <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
+#include "mandoc.h"
 #include "libman.h"
+#include "libmandoc.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 *);
-
 const	struct actions man_actions[MAN_MAX] = {
 	{ NULL }, /* br */
-	{ post_TH }, /* TH */
+	{ NULL }, /* TH */
 	{ NULL }, /* SH */
 	{ NULL }, /* SS */
 	{ NULL }, /* TP */
@@ -59,6 +55,20 @@ const	struct actions man_actions[MAN_MAX] = {
 	{ NULL }, /* RI */
 	{ NULL }, /* na */
 	{ NULL }, /* i */
+	{ NULL }, /* sp */
+	{ NULL }, /* nf */
+	{ NULL }, /* fi */
+	{ NULL }, /* r */
+	{ NULL }, /* RE */
+	{ NULL }, /* RS */
+	{ NULL }, /* DT */
+	{ NULL }, /* UC */
+	{ NULL }, /* PD */
+	{ NULL }, /* Sp */
+	{ NULL }, /* Vb */
+	{ NULL }, /* Ve */
+	{ NULL }, /* AT */
+	{ NULL }, /* in */
 };
 
 
@@ -72,122 +82,18 @@ 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;
 	}
-	return(1);
-}
 
-
-static int
-post_TH(struct man *m)
-{
-	struct man_node	*n;
-	char		*ep;
-	long		 lval;
-
-	if (m->meta.title)
-		free(m->meta.title);
-	if (m->meta.vol)
-		free(m->meta.vol);
-	if (m->meta.source)
-		free(m->meta.source);
-
-	m->meta.title = m->meta.vol = m->meta.source = NULL;
-	m->meta.msec = 0;
-	m->meta.date = 0;
-
-	/* ->TITLE<- MSEC DATE SOURCE VOL */
-
-	n = m->last->child;
-	assert(n);
-
-	if (NULL == (m->meta.title = strdup(n->string)))
-		return(man_verr(m, n->line, n->pos, 
-					"memory exhausted"));
-
-	/* 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;
-	else if ( ! man_vwarn(m, n->line, n->pos, "invalid section"))
-		return(0);
-
-	/* 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_vwarn(m, n->line, n->pos, "invalid date"))
-			return(0);
-		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_verr(m, n->line, n->pos, 
-						"memory exhausted"));
-
-	/* 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"));
-
-	/* 
-	 * The end document shouldn't have the prologue macros as part
-	 * of the syntax tree (they encompass only meta-data).  
-	 */
-
-	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;
-		n = m->last;
-		m->last = m->last->prev;
-		m->next = MAN_NEXT_SIBLING;
-	}
-
-	man_node_freelist(n);
-	return(1);
+	if (NULL == man_actions[m->last->tok].post)
+		return(1);
+	return((*man_actions[m->last->tok].post)(m));
 }
 
 
-static time_t
-man_atotime(const char *p)
-{
-	struct tm	 tm;
-	char		*pp;
 
-	(void)memset(&tm, 0, 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);
-}