=================================================================== RCS file: /cvs/mandoc/Attic/strings.c,v retrieving revision 1.23 retrieving revision 1.25 diff -u -p -r1.23 -r1.25 --- mandoc/Attic/strings.c 2009/03/02 12:09:32 1.23 +++ mandoc/Attic/strings.c 2009/03/05 13:12:12 1.25 @@ -1,4 +1,4 @@ -/* $Id: strings.c,v 1.23 2009/03/02 12:09:32 kristaps Exp $ */ +/* $Id: strings.c,v 1.25 2009/03/05 13:12:12 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -62,21 +62,26 @@ mdoc_isescape(const char *p) case ('e'): return(2); case ('*'): - if (0 == *++p || ! isgraph((int)*p)) + if (0 == *++p || ! isgraph((u_char)*p)) return(0); switch (*p) { case ('('): - if (0 == *++p || ! isgraph((int)*p)) + if (0 == *++p || ! isgraph((u_char)*p)) return(0); return(4); + case ('['): + for (c = 3, p++; *p && ']' != *p; p++, c++) + if ( ! isgraph((u_char)*p)) + break; + return(*p == ']' ? c : 0); default: break; } return(3); case ('('): - if (0 == *++p || ! isgraph((int)*p)) + if (0 == *++p || ! isgraph((u_char)*p)) return(0); - if (0 == *++p || ! isgraph((int)*p)) + if (0 == *++p || ! isgraph((u_char)*p)) return(0); return(4); case ('['): @@ -86,7 +91,7 @@ mdoc_isescape(const char *p) } for (c = 3, p++; *p && ']' != *p; p++, c++) - if ( ! isgraph((int)*p)) + if ( ! isgraph((u_char)*p)) break; return(*p == ']' ? c : 0); @@ -190,9 +195,9 @@ mdoc_atotime(const char *p) (void)memset(&tm, 0, sizeof(struct tm)); - if (xstrcmp(p, "$Mdocdate: March 2 2009 $")) + if (xstrcmp(p, "$Mdocdate: March 5 2009 $")) return(time(NULL)); - if ((pp = strptime(p, "$Mdocdate: March 2 2009 $", &tm)) && 0 == *pp) + if ((pp = strptime(p, "$Mdocdate: March 5 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)