=================================================================== RCS file: /cvs/mandoc/Attic/mdoc_strings.c,v retrieving revision 1.12 retrieving revision 1.15 diff -u -p -r1.12 -r1.15 --- mandoc/Attic/mdoc_strings.c 2009/10/27 08:26:12 1.12 +++ mandoc/Attic/mdoc_strings.c 2010/03/29 19:28:04 1.15 @@ -1,4 +1,4 @@ -/* $Id: mdoc_strings.c,v 1.12 2009/10/27 08:26:12 kristaps Exp $ */ +/* $Id: mdoc_strings.c,v 1.15 2010/03/29 19:28:04 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -14,6 +14,10 @@ * 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 @@ -56,11 +60,7 @@ static const struct mdoc_secname secnames[SECNAME_MAX] { "SECURITY CONSIDERATIONS", SEC_SECURITY } }; -#ifdef __linux__ -extern char *strptime(const char *, const char *, struct tm *); -#endif - int mdoc_iscdelim(char p) { @@ -68,6 +68,12 @@ mdoc_iscdelim(char p) switch (p) { case('|'): /* FALLTHROUGH */ + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + return(1); case('.'): /* FALLTHROUGH */ case(','): @@ -80,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; } @@ -122,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; - - memset(&tm, 0, 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); }