summaryrefslogtreecommitdiffstatshomepage
path: root/man.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-03-26 09:55:39 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-03-26 09:55:39 +0000
commit48c75ac0d363231aad256b8377a73bc1f8d158d5 (patch)
tree92966078d91ba12155f189f933548b38f9d08349 /man.c
parentef64725c09db0346dd0d5a32ae063e383d216b33 (diff)
downloadmandoc-48c75ac0d363231aad256b8377a73bc1f8d158d5.tar.gz
mandoc-48c75ac0d363231aad256b8377a73bc1f8d158d5.tar.zst
mandoc-48c75ac0d363231aad256b8377a73bc1f8d158d5.zip
Fixed reading whitespace for man.7 `. TH'.
Documented this.
Diffstat (limited to 'man.c')
-rw-r--r--man.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/man.c b/man.c
index d3223e69..898abd8e 100644
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.8 2009/03/25 21:46:24 kristaps Exp $ */
+/* $Id: man.c,v 1.9 2009/03/26 09:55:39 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
*
@@ -275,7 +275,7 @@ man_ptext(struct man *m, int line, char *buf)
int
man_pmacro(struct man *m, int ln, char *buf)
{
- int i, c;
+ int i, j, c;
char mac[5];
/* Comments and empties are quickly ignored. */
@@ -283,48 +283,49 @@ man_pmacro(struct man *m, int ln, char *buf)
if (0 == buf[1])
return(1);
- if (' ' == buf[1]) {
- i = 2;
+ i = 1;
+
+ if (' ' == buf[i]) {
+ i++;
while (buf[i] && ' ' == buf[i])
i++;
if (0 == buf[i])
return(1);
- return(man_vwarn(m, ln, 0, "invalid syntax"));
}
- if (buf[1] && '\\' == buf[1])
- if (buf[2] && '\"' == buf[2])
+ if (buf[i] && '\\' == buf[i])
+ if (buf[i + 1] && '\"' == buf[i + 1])
return(1);
/* Copy the first word into a nil-terminated buffer. */
- for (i = 1; i < 5; i++) {
- if (0 == (mac[i - 1] = buf[i]))
+ for (j = 0; j < 4; j++) {
+ if (0 == (mac[j] = buf[j + i]))
break;
- else if (' ' == buf[i])
+ else if (' ' == buf[j + i])
break;
}
- mac[i - 1] = 0;
+ mac[j] = 0;
- if (i == 5 || i <= 1) {
+ if (j == 4 || j < 1) {
if ( ! (MAN_IGN_MACRO & m->pflags)) {
- (void)man_verr(m, ln, 1,
+ (void)man_verr(m, ln, i,
"ill-formed macro: %s", mac);
goto err;
}
- if ( ! man_vwarn(m, ln, 1, "ill-formed macro: %s", mac))
+ if ( ! man_vwarn(m, ln, 0, "ill-formed macro: %s", mac))
goto err;
return(1);
}
if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
if ( ! (MAN_IGN_MACRO & m->pflags)) {
- (void)man_verr(m, ln, 1,
+ (void)man_verr(m, ln, i,
"unknown macro: %s", mac);
goto err;
}
- if ( ! man_vwarn(m, ln, 1, "unknown macro: %s", mac))
+ if ( ! man_vwarn(m, ln, i, "unknown macro: %s", mac))
goto err;
return(1);
}