===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_strings.c,v
retrieving revision 1.9
retrieving revision 1.26
diff -u -p -r1.9 -r1.26
--- mandoc/Attic/mdoc_strings.c	2009/07/04 09:01:55	1.9
+++ mandoc/Attic/mdoc_strings.c	2011/03/17 09:16:38	1.26
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_strings.c,v 1.9 2009/07/04 09:01:55 kristaps Exp $ */
+/*	$Id: mdoc_strings.c,v 1.26 2011/03/17 09:16:38 kristaps Exp $ */
 /*
- * Copyright (c) 2008 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,139 +14,62 @@
  * 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/types.h>
 
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 
+#include "mandoc.h"
 #include "libmdoc.h"
 
-/* FIXME: this file is poorly named. */
-
-struct mdoc_secname {
-	const char	*name;	/* Name of section. */
-	enum mdoc_sec	 sec;	/* Corresponding section. */
+static	const char * const secnames[SEC__MAX] = {
+	NULL,
+	"NAME",
+	"LIBRARY",
+	"SYNOPSIS",
+	"DESCRIPTION",
+	"IMPLEMENTATION NOTES",
+	"RETURN VALUES",
+	"ENVIRONMENT",
+	"FILES",
+	"EXIT STATUS",
+	"EXAMPLES",
+	"DIAGNOSTICS",
+	"COMPATIBILITY",
+	"ERRORS",
+	"SEE ALSO",
+	"STANDARDS",
+	"HISTORY",
+	"AUTHORS",
+	"CAVEATS",
+	"BUGS",
+	"SECURITY CONSIDERATIONS",
+	NULL
 };
 
-#define	SECNAME_MAX	(18)
-
-static	const struct mdoc_secname secnames[SECNAME_MAX] = {
-	{ "NAME", SEC_NAME },
-	{ "LIBRARY", SEC_LIBRARY },
-	{ "SYNOPSIS", SEC_SYNOPSIS },
-	{ "DESCRIPTION", SEC_DESCRIPTION },
-	{ "IMPLEMENTATION NOTES", SEC_IMPLEMENTATION },
-	{ "RETURN VALUES", SEC_RETURN_VALUES },
-	{ "ENVIRONMENT", SEC_ENVIRONMENT },
-	{ "FILES", SEC_FILES },
-	{ "EXAMPLES", SEC_EXAMPLES },
-	{ "DIAGNOSTICS", SEC_DIAGNOSTICS },
-	{ "COMPATIBILITY", SEC_COMPATIBILITY },
-	{ "ERRORS", SEC_ERRORS },
-	{ "SEE ALSO", SEC_SEE_ALSO },
-	{ "STANDARDS", SEC_STANDARDS },
-	{ "HISTORY", SEC_HISTORY },
-	{ "AUTHORS", SEC_AUTHORS },
-	{ "CAVEATS", SEC_CAVEATS },
-	{ "BUGS", SEC_BUGS },
-};
-
-#ifdef __linux__
-extern	char		*strptime(const char *, const char *, struct tm *);
-#endif
-
-
-int
-mdoc_iscdelim(char p)
-{
-
-	switch (p) {
-	case('|'):
-		/* FALLTHROUGH */
-	case('.'):
-		/* FALLTHROUGH */
-	case(','):
-		/* FALLTHROUGH */
-	case(';'):
-		/* FALLTHROUGH */
-	case(':'):
-		/* FALLTHROUGH */
-	case('?'):
-		/* FALLTHROUGH */
-	case('!'):
-		/* FALLTHROUGH */
-	case('('):
-		/* FALLTHROUGH */
-	case(')'):
-		/* FALLTHROUGH */
-	case('['):
-		/* FALLTHROUGH */
-	case(']'):
-		/* FALLTHROUGH */
-	case('{'):
-		/* FALLTHROUGH */
-	case('}'):
-		return(1);
-	default:
-		break;
-	}
-
-	return(0);
-}
-
-
-int
-mdoc_isdelim(const char *p)
-{
-
-	if (0 == *p)
-		return(0);
-	if (0 != *(p + 1))
-		return(0);
-	return(mdoc_iscdelim(*p));
-}
-
-
 enum mdoc_sec 
-mdoc_atosec(const char *p)
+mdoc_str2sec(const char *p)
 {
 	int		 i;
 
-	for (i = 0; i < SECNAME_MAX; i++) 
-		if (0 == strcmp(p, secnames[i].name))
-			return(secnames[i].sec);
+	for (i = 0; i < (int)SEC__MAX; i++) 
+		if (secnames[i] && 0 == strcmp(p, secnames[i]))
+			return((enum mdoc_sec)i);
 
 	return(SEC_CUSTOM);
 }
 
 
-time_t
-mdoc_atotime(const char *p)
-{
-	struct tm	 tm;
-	char		*pp;
-
-	bzero(&tm, sizeof(struct tm));
-
-	if (0 == strcmp(p, "$" "Mdocdate$"))
-		return(time(NULL));
-	if ((pp = strptime(p, "$" "Mdocdate: %b %d %Y $", &tm)) && 0 == *pp)
-		return(mktime(&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);
-}
-
-
 /* FIXME: move this into an editable .in file. */
 size_t
-mdoc_macro2len(int macro)
+mdoc_macro2len(enum mdoct macro)
 {
 
 	switch (macro) {