Skip to content

[13740] Add afunction that checks for repeated -I paths (issue #78) #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MiguelCompany merged 1 commit into from
Jan 10, 2025
Merged

[13740] Add afunction that checks for repeated -I paths (issue #78) #429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions src/main/java/com/eprosima/fastdds/fastddsgen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.IOError;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.nio.file.InvalidPathException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand Down Expand Up @@ -273,7 +275,10 @@ else if (arg.equals(include_path_arg))
{
if (count < args.length)
{
m_includePaths.add(include_path_arg.concat(args[count++]));
String pathStr = args[count++];
if (!isIncludePathDuplicated(pathStr)) {
m_includePaths.add(include_path_arg.concat(pathStr));
}
}
else
{
Expand Down Expand Up @@ -560,8 +565,31 @@ private void showVersion()
System.out.println(m_appName + " version " + version);
}



private boolean isIncludePathDuplicated(String pathToCheck) {
try {
Path path = Paths.get(pathToCheck);
String absPath = path.toAbsolutePath().toString();
boolean isDuplicateFound = false;
for (String includePath : m_includePaths) {
// include paths are prefixed with "-I"
if (includePath.length() <= 2) {
continue;
}
String absIncludePath = Paths.get(includePath.substring(2)).toAbsolutePath().toString();
if (absPath.toLowerCase().equals(absIncludePath.toLowerCase())) {
isDuplicateFound = true;
break;
}
}
if (isDuplicateFound) {
return true;
}
} catch (InvalidPathException | IOError | SecurityException ex) {
// path operations failed, just returning false
}
return false;
}

/*
* ----------------------------------------------------------------------------------------
* Arguments
Expand Down