summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-07-27 19:43:02 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-07-27 19:43:02 +0000
commitb00fcba133e2170f5308eb02bfa9b9b8d7dea0a0 (patch)
treecc2381829bd6658e8c0cd731faafa3e3bc1a0ac2
parent5226c4fdcd61545e72ba42ed649a213a893e2411 (diff)
downloadmandoc-b00fcba133e2170f5308eb02bfa9b9b8d7dea0a0.tar.gz
main.c using fprintf instead of warnx for parse errors (like cc).
Error string is now file:line:col: message. Removed sed from vim -q example in manuals.7. Fixed column reporting (off by one).
-rw-r--r--main.c11
-rw-r--r--manuals.73
-rw-r--r--mdoc.c4
3 files changed, 8 insertions, 10 deletions
diff --git a/main.c b/main.c
index 84bccdf5..b8c5aa33 100644
--- a/main.c
+++ b/main.c
@@ -418,7 +418,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
/* NOTE a parser may not have been assigned, yet. */
if ( ! (man || mdoc)) {
- warnx("%s: not a manual", curp->file);
+ (void)fprintf(stderr, "%s: not a manual", curp->file);
return(0);
}
@@ -639,8 +639,8 @@ merr(void *arg, int line, int col, const char *msg)
curp = (struct curparse *)arg;
- warnx("%s:%d: error: %s (column %d)",
- curp->file, line, msg, col);
+ (void)fprintf(stderr, "%s:%d:%d: error: %s\n",
+ curp->file, line, col + 1, msg);
return(0);
}
@@ -656,13 +656,12 @@ mwarn(void *arg, int line, int col, const char *msg)
if ( ! (curp->wflags & WARN_WALL))
return(1);
- warnx("%s:%d: warning: %s (column %d)",
- curp->file, line, msg, col);
+ (void)fprintf(stderr, "%s:%d:%d: warning: %s\n",
+ curp->file, line, col + 1, msg);
if ( ! (curp->wflags & WARN_WERR))
return(1);
- warnx("considering warnings as errors");
return(0);
}
diff --git a/manuals.7 b/manuals.7
index 37d13737..9cb6ada1 100644
--- a/manuals.7
+++ b/manuals.7
@@ -113,8 +113,7 @@ The quick-fix feature of
is useful for checking over many manuals:
.Bd -literal -offset indent
% mandoc \-Wall \-fstrict \-Tlint \-fign-errors \e
- `find /usr/src \-name \e*\e.[1-9]` 2>&1 | \e
- sed 's!^mandoc: !!' > /tmp/mandoc.errs
+ ./path/to/manuals/* 2>&1 > /tmp/mandoc.errs
% vim -q /tmp/mandoc.errs
.Ed
.Pp
diff --git a/mdoc.c b/mdoc.c
index 39e494b1..24d75560 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -657,10 +657,10 @@ static int
macrowarn(struct mdoc *m, int ln, const char *buf)
{
if ( ! (MDOC_IGN_MACRO & m->pflags))
- return(mdoc_verr(m, ln, 1,
+ return(mdoc_verr(m, ln, 0,
"unknown macro: %s%s",
buf, strlen(buf) > 3 ? "..." : ""));
- return(mdoc_vwarn(m, ln, 1, "unknown macro: %s%s",
+ return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s",
buf, strlen(buf) > 3 ? "..." : ""));
}