=================================================================== RCS file: /cvs/mandoc/Attic/mdoc_strings.c,v retrieving revision 1.9 retrieving revision 1.15 diff -u -p -r1.9 -r1.15 --- mandoc/Attic/mdoc_strings.c 2009/07/04 09:01:55 1.9 +++ mandoc/Attic/mdoc_strings.c 2010/03/29 19:28:04 1.15 @@ -1,4 +1,4 @@ -/* $Id: mdoc_strings.c,v 1.9 2009/07/04 09:01:55 kristaps Exp $ */ +/* $Id: mdoc_strings.c,v 1.15 2010/03/29 19:28:04 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -14,12 +14,17 @@ * 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 #include #include #include #include +#include #include "libmdoc.h" @@ -30,7 +35,7 @@ struct mdoc_secname { enum mdoc_sec sec; /* Corresponding section. */ }; -#define SECNAME_MAX (18) +#define SECNAME_MAX (20) static const struct mdoc_secname secnames[SECNAME_MAX] = { { "NAME", SEC_NAME }, @@ -38,6 +43,7 @@ static const struct mdoc_secname secnames[SECNAME_MAX] { "SYNOPSIS", SEC_SYNOPSIS }, { "DESCRIPTION", SEC_DESCRIPTION }, { "IMPLEMENTATION NOTES", SEC_IMPLEMENTATION }, + { "EXIT STATUS", SEC_EXIT_STATUS }, { "RETURN VALUES", SEC_RETURN_VALUES }, { "ENVIRONMENT", SEC_ENVIRONMENT }, { "FILES", SEC_FILES }, @@ -51,13 +57,10 @@ static const struct mdoc_secname secnames[SECNAME_MAX] { "AUTHORS", SEC_AUTHORS }, { "CAVEATS", SEC_CAVEATS }, { "BUGS", SEC_BUGS }, + { "SECURITY CONSIDERATIONS", SEC_SECURITY } }; -#ifdef __linux__ -extern char *strptime(const char *, const char *, struct tm *); -#endif - int mdoc_iscdelim(char p) { @@ -65,6 +68,12 @@ mdoc_iscdelim(char p) switch (p) { case('|'): /* FALLTHROUGH */ + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + return(1); case('.'): /* FALLTHROUGH */ case(','): @@ -77,18 +86,12 @@ mdoc_iscdelim(char p) /* FALLTHROUGH */ case('!'): /* FALLTHROUGH */ - case('('): - /* FALLTHROUGH */ case(')'): /* FALLTHROUGH */ - case('['): - /* FALLTHROUGH */ case(']'): /* FALLTHROUGH */ - case('{'): - /* FALLTHROUGH */ case('}'): - return(1); + return(2); default: break; } @@ -119,28 +122,6 @@ mdoc_atosec(const char *p) return(secnames[i].sec); 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); }