=================================================================== RCS file: /cvs/mandoc/Attic/strings.c,v retrieving revision 1.12 retrieving revision 1.16 diff -u -p -r1.12 -r1.16 --- mandoc/Attic/strings.c 2009/02/20 23:35:36 1.12 +++ mandoc/Attic/strings.c 2009/02/24 11:43:13 1.16 @@ -1,4 +1,4 @@ -/* $Id: strings.c,v 1.12 2009/02/20 23:35:36 kristaps Exp $ */ +/* $Id: strings.c,v 1.16 2009/02/24 11:43:13 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -25,12 +25,60 @@ #include #endif +/* + * Convert scalars to and from string format. + */ + #include "private.h" #ifdef __linux__ extern char *strptime(const char *, const char *, struct tm *); #endif + +size_t +mdoc_isescape(const char *p) +{ + size_t c; + + if ('\\' != *p++) + return(0); + + switch (*p) { + case ('\\'): + /* FALLTHROUGH */ + case ('\''): + /* FALLTHROUGH */ + case ('`'): + /* FALLTHROUGH */ + case ('-'): + /* FALLTHROUGH */ + case (' '): + /* FALLTHROUGH */ + case ('.'): + /* FALLTHROUGH */ + case ('e'): + return(2); + case ('('): + if (0 == *++p) + return(0); + if (0 == *++p) + return(0); + return(4); + case ('['): + break; + default: + return(0); + } + + for (c = 3, p++; *p && ']' != *p; p++, c++) + if (isspace(*p)) + break; + + return(*p == ']' ? c : 0); +} + + int mdoc_iscdelim(char p) { @@ -128,9 +176,9 @@ mdoc_atotime(const char *p) (void)memset(&tm, 0, sizeof(struct tm)); - if (xstrcmp(p, "$Mdocdate: February 20 2009 $")) + if (xstrcmp(p, "$Mdocdate: February 24 2009 $")) return(time(NULL)); - if ((pp = strptime(p, "$Mdocdate: February 20 2009 $", &tm)) && 0 == *pp) + if ((pp = strptime(p, "$Mdocdate: February 24 2009 $", &tm)) && 0 == *pp) return(mktime(&tm)); /* XXX - this matches "June 1999", which is wrong. */ if ((pp = strptime(p, "%b %d %Y", &tm)) && 0 == *pp) @@ -336,7 +384,7 @@ mdoc_type2a(enum mdoc_type type) } -char * +const char * mdoc_arch2a(enum mdoc_arch arch) { @@ -404,7 +452,7 @@ mdoc_arch2a(enum mdoc_arch arch) } -char * +const char * mdoc_vol2a(enum mdoc_vol vol) { @@ -438,7 +486,7 @@ mdoc_vol2a(enum mdoc_vol vol) } -char * +const char * mdoc_msec2a(enum mdoc_msec msec) {