X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChktex.C;h=6b86ed68504b3956c4d36512d66b4dd2b7d50e80;hb=9dafe9b9a5cb12e19e0f3a1a9669d81dc140b0e3;hp=35c6ba5455104a9bcfebec568f80089860093ae5;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/Chktex.C b/src/Chktex.C
index 35c6ba5455..6b86ed6850 100644
--- a/src/Chktex.C
+++ b/src/Chktex.C
@@ -1,47 +1,44 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor 	 
- *	     Copyright (C) 1995 Matthias Ettrich
- *           Copyright (C) 1995-1998 The LyX Team.
+ *	     Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
  *
- *           This file is Copyright (C) 1997-1998
+ *           This file is Copyright 1997-1998
  *           Asger Alstrup
  *
- *======================================================
+ * ====================================================== 
  */
 
 #include <config.h>
 
-#include <stdlib.h> // atoi
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include "Chktex.h"
 #include "LaTeX.h" // TeXErrors
-#include "filetools.h"
 #include "lyxlex.h"
-#include "FileInfo.h"
-#include "error.h"
-#include "syscall.h"
-#include "syscontr.h"
-#include "pathstack.h"
+#include "debug.h"
 #include "gettext.h"
 
-// 	$Id: Chktex.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $	
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/systemcall.h"
+#include "support/path.h"
+#include "support/lstrings.h"
 
-#if !defined(lint) && !defined(WITH_WARNINGS)
-static char vcid[] = "$Id: Chktex.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $";
-#endif /* lint */
+#include <fstream>
 
+using std::ifstream;
+using std::getline;
 
 /*
  * CLASS Chktex
  */
 
-Chktex::Chktex(LString const & chktex, LString const & f, LString const & p)
+Chktex::Chktex(string const & chktex, string const & f, string const & p)
 		: cmd(chktex), file(f), path(p)
 {
 }
@@ -50,10 +47,10 @@ Chktex::Chktex(LString const & chktex, LString const & f, LString const & p)
 int Chktex::run(TeXErrors &terr)
 {
 	// run bibtex
-	LString log = ChangeExtension(file, ".log", true);
-	LString tmp = cmd + " -q -v0 -b0 -x " + file + " -o " + log;
-        Systemcalls one;
-	int result= one.Startscript(Systemcalls::System, tmp);
+	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 {
@@ -63,37 +60,30 @@ int Chktex::run(TeXErrors &terr)
 }
 
 
-int Chktex::scanLogFile(TeXErrors &terr)
+int Chktex::scanLogFile(TeXErrors & terr)
 {
-	LString token;
+	string token;
 	int retval = 0;
 
-	LyXLex lex(NULL, 0);
-
-	LString tmp = ChangeExtension(file, ".log", true);
-
-	if (!lex.setFile(tmp)) {
-		// Unable to open file. Return at once
-		return -1;
-	}
-
-	while (lex.IsOK()) {
-		if (lex.EatLine())
-			token = lex.GetString();
-		else // blank line in the file being read
-			continue;
-
-		LString srcfile, line, pos, warno, warning;
-		token.split(srcfile, ':');
-		token.split(line, ':');
-		token.split(pos, ':');
-		token.split(warno, ':');
-		token.split(warning, ':');
-
-		int lineno = atoi(line.c_str());
+	string tmp = OnlyFilename(ChangeExtension(file, ".log"));
+
+	ifstream ifs(tmp.c_str());
+	while (getline(ifs, token)) {
+		string srcfile;
+		string line;
+		string pos;
+		string warno;
+		string warning;
+		token = split(token, srcfile, ':');
+		token = split(token, line, ':');
+		token = split(token, pos, ':');
+		token = split(token, warno, ':');
+		token = split(token, warning, ':');
+
+		int lineno = lyx::atoi(line);
 		warno = _("ChkTeX warning id #") + warno;
 		terr.insertError(lineno, warno, warning);
-		retval++;
+		++retval;
 	}
 	return retval;
 }