mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Fixed a potential file handle leak.

Browse source
This commit is contained in:
Sergey Prigogin 2012-04-19 12:16:21 -07:00
parent e58cbbc948
commit d557165f90
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/ErrorParser.java
View file

@ -7,11 +7,13 @@
* *
* Contributors: * Contributors:
* Red Hat Inc. - initial API and implementation * Red Hat Inc. - initial API and implementation
* Sergey Prigogin (Google)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.autotools.core; package org.eclipse.cdt.internal.autotools.core;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader; import java.io.LineNumberReader;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -29,11 +31,10 @@ import org.eclipse.core.runtime.Path;
// possibly other data in the future. The standard CDT ErrorParserManager doesn't allow // possibly other data in the future. The standard CDT ErrorParserManager doesn't allow
// us to pass an extended ProblemMarkerInfo, so we are forced to have our own mechanism // us to pass an extended ProblemMarkerInfo, so we are forced to have our own mechanism
// which is similar to the CDT one. // which is similar to the CDT one.
public class ErrorParser extends MarkerGenerator implements IErrorParser{ public class ErrorParser extends MarkerGenerator implements IErrorParser {
public static final String ID = AutotoolsPlugin.PLUGIN_ID + ".errorParser"; //$NON-NLS-1$ public static final String ID = AutotoolsPlugin.PLUGIN_ID + ".errorParser"; //$NON-NLS-1$
private Pattern pkgconfigError = private Pattern pkgconfigError =
Pattern.compile(".*?(configure:\\s+error:\\s+Package requirements\\s+\\((.*?)\\)\\s+were not met).*"); //$NON-NLS-1$ Pattern.compile(".*?(configure:\\s+error:\\s+Package requirements\\s+\\((.*?)\\)\\s+were not met).*"); //$NON-NLS-1$
private Pattern genconfigError = private Pattern genconfigError =
Pattern.compile(".*?configure:\\s+error:\\s+(.*)"); //$NON-NLS-1$ Pattern.compile(".*?configure:\\s+error:\\s+(.*)"); //$NON-NLS-1$
private Pattern checkingFail = private Pattern checkingFail =
@ -54,6 +55,7 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser{
this.sourcePath = sourcePath; this.sourcePath = sourcePath;
} }
@Override
public boolean processLine(String line, public boolean processLine(String line,
org.eclipse.cdt.core.ErrorParserManager eoParser) { org.eclipse.cdt.core.ErrorParserManager eoParser) {
@ -149,10 +151,9 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser{
if (!file.exists()) if (!file.exists())
return null; return null;
FileReader stream; LineNumberReader reader = null;
try { try {
stream = new FileReader(file); reader = new LineNumberReader(new FileReader(file));
LineNumberReader reader = new LineNumberReader(stream);
// look for something like: // look for something like:
// if test "${ac_cv_prog_WINDRES+set}" = set; then : // if test "${ac_cv_prog_WINDRES+set}" = set; then :
@ -179,10 +180,16 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser{
} }
line = reader.readLine(); line = reader.readLine();
} }
stream.close();
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
// Ignore.
}
}
} }
return null; return null;
@ -196,31 +203,34 @@ public class ErrorParser extends MarkerGenerator implements IErrorParser{
* @return * @return
*/ */
private int getErrorConfigLineNumber(String name) { private int getErrorConfigLineNumber(String name) {
LineNumberReader reader = null;
try { try {
File file = new File(buildDir + "/config.log"); File file = new File(buildDir + "/config.log");
// If the log file is not present there is nothing we can do. // If the log file is not present there is nothing we can do.
if (!file.exists()) if (!file.exists())
return -1; return -1;
FileReader stream = new FileReader(file); reader = new LineNumberReader(new FileReader(file));
LineNumberReader reader = new LineNumberReader(stream);
Pattern errorPattern = Pattern Pattern errorPattern =
.compile("configure:(\\d+): checking for " + name); //$NON-NLS-1$ Pattern.compile("configure:(\\d+): checking for " + name); //$NON-NLS-1$
String line = reader.readLine(); String line;
while (line != null) { while ((line = reader.readLine()) != null) {
Matcher m = errorPattern.matcher(line); Matcher m = errorPattern.matcher(line);
if (m.matches()) { if (m.matches()) {
return Integer.parseInt(m.group(1)); return Integer.parseInt(m.group(1));
} }
line = reader.readLine();
} }
stream.close();
} catch (Exception e) { } catch (Exception e) {
return -1; return -1;
} finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
// Ignore.
}
}
} }
return -1; return -1;
} }