===================================================================
RCS file: /cvs/mandoc/Attic/strings.c,v
retrieving revision 1.4
retrieving revision 1.11
diff -u -p -r1.4 -r1.11
--- mandoc/Attic/strings.c	2008/12/29 18:08:44	1.4
+++ mandoc/Attic/strings.c	2009/01/20 22:55:46	1.11
@@ -1,4 +1,4 @@
-/* $Id: strings.c,v 1.4 2008/12/29 18:08:44 kristaps Exp $ */
+/* $Id: strings.c,v 1.11 2009/01/20 22:55:46 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef __linux__
+#ifndef __OpenBSD__
 #include <time.h>
 #endif
 
@@ -36,8 +36,6 @@ mdoc_iscdelim(char p)
 {
 
 	switch (p) {
-	case('{'):
-		/* FALLTHROUGH */
 	case('.'):
 		/* FALLTHROUGH */
 	case(','):
@@ -58,6 +56,8 @@ mdoc_iscdelim(char p)
 		/* FALLTHROUGH */
 	case(']'):
 		/* FALLTHROUGH */
+	case('{'):
+		/* FALLTHROUGH */
 	case('}'):
 		return(1);
 	default:
@@ -81,47 +81,39 @@ mdoc_isdelim(const char *p)
 
 
 enum mdoc_sec 
-mdoc_atosec(size_t sz, const char **p)
+mdoc_atosec(const char *p)
 {
 
-	assert(sz > 0);
-	if (sz > 2)
-		return(SEC_CUSTOM);
-	if (sz == 2) {
-		if (0 == strcmp(*p, "RETURN") &&
-				0 == strcmp(*(p + 1), "VALUES"))
-			return(SEC_RETURN_VALUES);
-		if (0 == strcmp(*p, "SEE") &&
-				0 == strcmp(*(p + 1), "ALSO"))
-			return(SEC_SEE_ALSO);
-		return(SEC_CUSTOM);
-	}
-
-	if (0 == strcmp(*p, "NAME"))
+	assert(p);
+	if (0 == strcmp(p, "NAME"))
 		return(SEC_NAME);
-	else if (0 == strcmp(*p, "SYNOPSIS"))
+	else if (0 == strcmp(p, "RETURN VALUES"))
+		return(SEC_RETURN_VALUES);
+	else if (0 == strcmp(p, "SEE ALSO"))
+		return(SEC_SEE_ALSO);
+	else if (0 == strcmp(p, "SYNOPSIS"))
 		return(SEC_SYNOPSIS);
-	else if (0 == strcmp(*p, "DESCRIPTION"))
+	else if (0 == strcmp(p, "DESCRIPTION"))
 		return(SEC_DESCRIPTION);
-	else if (0 == strcmp(*p, "ENVIRONMENT"))
+	else if (0 == strcmp(p, "ENVIRONMENT"))
 		return(SEC_ENVIRONMENT);
-	else if (0 == strcmp(*p, "FILES"))
+	else if (0 == strcmp(p, "FILES"))
 		return(SEC_FILES);
-	else if (0 == strcmp(*p, "EXAMPLES"))
+	else if (0 == strcmp(p, "EXAMPLES"))
 		return(SEC_EXAMPLES);
-	else if (0 == strcmp(*p, "DIAGNOSTICS"))
+	else if (0 == strcmp(p, "DIAGNOSTICS"))
 		return(SEC_DIAGNOSTICS);
-	else if (0 == strcmp(*p, "ERRORS"))
+	else if (0 == strcmp(p, "ERRORS"))
 		return(SEC_ERRORS);
-	else if (0 == strcmp(*p, "STANDARDS"))
+	else if (0 == strcmp(p, "STANDARDS"))
 		return(SEC_STANDARDS);
-	else if (0 == strcmp(*p, "HISTORY"))
+	else if (0 == strcmp(p, "HISTORY"))
 		return(SEC_HISTORY);
-	else if (0 == strcmp(*p, "AUTHORS"))
+	else if (0 == strcmp(p, "AUTHORS"))
 		return(SEC_AUTHORS);
-	else if (0 == strcmp(*p, "CAVEATS"))
+	else if (0 == strcmp(p, "CAVEATS"))
 		return(SEC_CAVEATS);
-	else if (0 == strcmp(*p, "BUGS"))
+	else if (0 == strcmp(p, "BUGS"))
 		return(SEC_BUGS);
 
 	return(SEC_CUSTOM);
@@ -132,11 +124,19 @@ time_t
 mdoc_atotime(const char *p)
 {
 	struct tm	 tm;
+	char		*pp;
 
-	if (strptime(p, "%b %d %Y", &tm))
+	(void)memset(&tm, 0, sizeof(struct tm));
+
+	if (xstrcmp(p, "$Mdocdate: January 20 2009 $"))
+		return(time(NULL));
+	if ((pp = strptime(p, "$Mdocdate: January 20 2009 $", &tm)) && 0 == *pp)
 		return(mktime(&tm));
-	if (strptime(p, "%b %d, %Y", &tm))
+	/* XXX - this matches "June 1999", which is wrong. */
+	if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp)
 		return(mktime(&tm));
+	if ((pp = strptime(p, "%b %d, %Y", &tm)) && 0 == *pp)
+		return(mktime(&tm));
 
 	return(0);
 }
@@ -226,6 +226,8 @@ mdoc_atoarch(const char *p)
 		return(ARCH_amiga);
 	else if (0 == strcmp(p, "arc"))
 		return(ARCH_arc);
+	else if (0 == strcmp(p, "arm"))
+		return(ARCH_arm);
 	else if (0 == strcmp(p, "armish"))
 		return(ARCH_armish);
 	else if (0 == strcmp(p, "aviion"))
@@ -304,4 +306,31 @@ mdoc_atoatt(const char *p)
 		return(ATT_V4);
 	
 	return(ATT_DEFAULT);
+}
+
+
+char *
+mdoc_type2a(enum mdoc_type type)
+{
+	switch (type) {
+	case (MDOC_ROOT):
+		return("root");
+	case (MDOC_BLOCK):
+		return("block");
+	case (MDOC_HEAD):
+		return("block-head");
+	case (MDOC_BODY):
+		return("block-body");
+	case (MDOC_TAIL):
+		return("block-tail");
+	case (MDOC_ELEM):
+		return("elem");
+	case (MDOC_TEXT):
+		return("text");
+	default:
+		break;
+	}
+
+	abort();
+	/* NOTREACHED */
 }