aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mandoc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mandoc.c')
-rw-r--r--mandoc.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/mandoc.c b/mandoc.c
index 44de75b4..72eba853 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -1,4 +1,4 @@
-/* $Id: mandoc.c,v 1.22 2010/07/18 12:10:08 kristaps Exp $ */
+/* $Id: mandoc.c,v 1.23 2010/07/18 17:00:26 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
@@ -240,8 +240,10 @@ mandoc_a2time(int flags, const char *p)
int
-mandoc_eos(const char *p, size_t sz)
+mandoc_eos(const char *p, size_t sz, int enclosed)
{
+ const char *q;
+ int found;
if (0 == sz)
return(0);
@@ -252,8 +254,9 @@ mandoc_eos(const char *p, size_t sz)
* propogate outward.
*/
- for ( ; sz; sz--) {
- switch (p[(int)sz - 1]) {
+ found = 0;
+ for (q = p + sz - 1; q >= p; q--) {
+ switch (*q) {
case ('\"'):
/* FALLTHROUGH */
case ('\''):
@@ -261,22 +264,22 @@ mandoc_eos(const char *p, size_t sz)
case (']'):
/* FALLTHROUGH */
case (')'):
+ if (0 == found)
+ enclosed = 1;
break;
case ('.'):
- /* Escaped periods. */
- if (sz > 1 && '\\' == p[(int)sz - 2])
- return(0);
/* FALLTHROUGH */
case ('!'):
/* FALLTHROUGH */
case ('?'):
- return(1);
+ found = 1;
+ break;
default:
- return(0);
+ return(found && (!enclosed || isalnum(*q)));
}
}
- return(0);
+ return(found && !enclosed);
}