commit 0e08b4e4f51be980aa937f69911d9cee270fb22d
Author: Juergen Spitzmueller <[email protected]>
Date: Sat Feb 17 11:25:28 2018 +0100
Adapt to new ChkTeX return values.
As of v. 1.7.7, chktex has four exit values. Only consider the program
failed with EXIT_FAILURE (1). This is backwards compatible to chktex
up to v. 1.7.5 and later patched versions included in TeXLive, where
there was the distinction EXIT_FAILURE (program failed) and EXIT_SUCCESS
(program successfully run, with or without something to report).
Note that ChkTeX v. 1.7.5 and 1.7.6 vanilla (as included in MikTeX) also
returned EXITE_FAILURE if ChkTeX found something to report.
We do not, and never did, support this case.
Fixes: #9989 (after ChkTeX 1.7.7. is released).
(cherry picked from commit 0d806799aaef65b12a9b75e8c49c2613c68d5ac2)
---
src/Chktex.cpp | 16 +++++++++++-----
status.23x | 2 ++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/Chktex.cpp b/src/Chktex.cpp
index 816837a..2db47b4 100644
--- a/src/Chktex.cpp
+++ b/src/Chktex.cpp
@@ -34,16 +34,22 @@ Chktex::Chktex(string const & chktex, string const & f,
string const & p)
int Chktex::run(TeXErrors &terr)
{
- // run bibtex
+ // run chktex
string log = onlyFileName(changeExtension(file, ".log"));
string tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log;
Systemcall one;
int result = one.startscript(Systemcall::Wait, tmp);
- if (result == 0) {
- result = scanLogFile(terr);
- } else {
+ // ChkTeX (as of v. 1.7.7) has the following return values:
+ // 0 = EXIT_SUCCESS : program ran successfully, nothing to report
+ // 1 = EXIT_FAILURE : program ran unsucessfully
+ // 2 = EXIT_WARNINGS : program ran successfully, only warnings to report
+ // 3 = EXIT_ERRORS : program ran successfully, errors to report
+ // We only check for EXIT_FAILURE here, since older versions of ChkTeX
+ // returned 0 also in case 2 and 3.
+ if (result == EXIT_FAILURE)
result = -1;
- }
+ else
+ result = scanLogFile(terr);
return result;
}
diff --git a/status.23x b/status.23x
index 4e2348d..fc321d3 100644
--- a/status.23x
+++ b/status.23x
@@ -52,6 +52,8 @@ What's new
- Do not use English, but the context language, when pasting from math
(bug 2596).
+- Fix ChkTeX on Windows (requires ChkTeX 1.7.7 at least) (bug 9989).
+
* INTERNALS
