github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-15 00:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

final tested patch for issue #285

Browse Source
This commit is contained in:
Jeremy Long
2015-07-28 06:33:40 -04:00
parent 096af016ef
commit 1ae3a63f5c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java
View File

@@ -138,12 +138,12 @@ public class App {
// }
for (String file : files) {
File f = new File(file);
if (f.exists() && f.isFile()) {
engine.scan(f);
} else {
String antPath = ensureCanonicalPath(file);
antStylePaths.add(antPath);
}
// if (f.exists() && f.isFile()) {
// engine.scan(f);
// } else {
String antPath = ensureCanonicalPath(file);
antStylePaths.add(antPath);
//}
}
final Set<File> paths = new HashSet<File>();
@@ -159,7 +159,8 @@ public class App {
final int pos = getLastFileSeparator(include);
final String tmpBase = include.substring(0, pos);
final String tmpInclude = include.substring(pos + 1);
if (tmpInclude.indexOf('*') >= 0 || tmpInclude.indexOf('?') >= 0) {
if (tmpInclude.indexOf('*') >= 0 || tmpInclude.indexOf('?') >= 0
|| (new File(include)).isFile()) {
baseDir = new File(tmpBase);
include = tmpInclude;
} else {
@@ -172,6 +173,9 @@ public class App {
scanner.setBasedir(baseDir);
scanner.setIncludes(include);
scanner.setMaxLevelsOfSymlinks(symLinkDepth);
if (symLinkDepth <= 0) {
scanner.setFollowSymlinks(false);
}
if (excludes != null && excludes.length > 0) {
scanner.addExcludes(excludes);
}