aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2022-06-05 10:19:54 +0000
committerIngo Schwarze <schwarze@openbsd.org>2022-06-05 10:19:54 +0000
commit2e4490e7023dd483d992df8eb6f75860fd445fe4 (patch)
treea7355c82b82ce95b48666b2d89c5b2f99a0980b8
parentccdf39d9cb63bb341dbb5c88c9090ac8e05b350c (diff)
downloadmandoc-2e4490e7023dd483d992df8eb6f75860fd445fe4.tar.gz
mandoc-2e4490e7023dd483d992df8eb6f75860fd445fe4.tar.zst
mandoc-2e4490e7023dd483d992df8eb6f75860fd445fe4.zip
Small cleanup of error reporting:
call mandoc_msg() only once at the end, not sometimes in the middle, classify incomplete, non-expanding escape sequences as ESCAPE_ERROR, and also reduce the number of return statemants; no formatting change intended.
-rw-r--r--roff_escape.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/roff_escape.c b/roff_escape.c
index 9d02054d..8145a9dd 100644
--- a/roff_escape.c
+++ b/roff_escape.c
@@ -98,6 +98,7 @@ roff_escape(const char *buf, const int ln, const int aesc,
iarg = iendarg = iend = inam + 1;
maxl = INT_MAX;
term = '\0';
+ err = MANDOCERR_OK;
switch (buf[inam]) {
/* Escape sequences taking no arguments at all. */
@@ -312,6 +313,10 @@ roff_escape(const char *buf, const int ln, const int aesc,
/* Ignore an incomplete argument except for \w. */
if (buf[inam] != 'w')
iendarg = iarg;
+ if (rval == ESCAPE_EXPAND)
+ err = MANDOCERR_ESC_BAD;
+ else
+ rval = ESCAPE_ERROR;
break;
}
if (buf[iendarg] == term) {
@@ -343,9 +348,6 @@ roff_escape(const char *buf, const int ln, const int aesc,
iend = ++iendarg;
}
}
- if (resc != NULL && ((maxl != INT_MAX && maxl != 0) ||
- (term != '\0' && buf[iendarg] != term)))
- mandoc_msg(MANDOCERR_ESC_BAD, ln, iesc, "%s", buf + iesc);
/* Post-process depending on the content of the argument. */
@@ -481,18 +483,17 @@ out:
err = MANDOCERR_ESC_UNSUPP;
break;
case ESCAPE_UNDEF:
- if (buf[inam] == '\\' || buf[inam] == '.')
- return rval;
- err = MANDOCERR_ESC_UNDEF;
+ if (buf[inam] != '\\' && buf[inam] != '.')
+ err = MANDOCERR_ESC_UNDEF;
break;
case ESCAPE_SPECIAL:
- if (mchars_spec2cp(buf + iarg, argl) >= 0)
- return rval;
- err = MANDOCERR_ESC_BAD;
+ if (mchars_spec2cp(buf + iarg, argl) < 0)
+ err = MANDOCERR_ESC_BAD;
break;
default:
- return rval;
+ break;
}
- mandoc_msg(err, ln, iesc, "%.*s", iend - iesc, buf + iesc);
+ if (err != MANDOCERR_OK)
+ mandoc_msg(err, ln, iesc, "%.*s", iend - iesc, buf + iesc);
return rval;
}