diff --git a/CMakeLists.txt b/CMakeLists.txt index 2686571..eef5f0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,12 +58,9 @@ generate_documentation() # Target: cmkr set(cmkr_SOURCES - "src/arguments.cpp" - "src/build.cpp" - "src/cmake_generator.cpp" - "src/help.cpp" - "src/main.cpp" - "src/project_parser.cpp" + cmake.toml + "cmake/cmkr.cmake" + "cmake/version.hpp.in" "include/arguments.hpp" "include/build.hpp" "include/cmake_generator.hpp" @@ -71,9 +68,12 @@ set(cmkr_SOURCES "include/help.hpp" "include/literals.hpp" "include/project_parser.hpp" - "cmake/cmkr.cmake" - "cmake/version.hpp.in" - cmake.toml + "src/arguments.cpp" + "src/build.cpp" + "src/cmake_generator.cpp" + "src/help.cpp" + "src/main.cpp" + "src/project_parser.cpp" ) add_executable(cmkr) diff --git a/src/cmake_generator.cpp b/src/cmake_generator.cpp index f3ed4b0..75118ff 100644 --- a/src/cmake_generator.cpp +++ b/src/cmake_generator.cpp @@ -54,57 +54,85 @@ static std::string format(const char *format, const tsl::ordered_map expand_cmake_path(const fs::path &name, const fs::path &toml_dir, bool is_root_project) { - std::vector temp; - - auto extract_suffix = [](const fs::path &base, const fs::path &full) { - auto fullpath = full.string(); - auto base_len = base.string().length(); - auto delet = fullpath.substr(base_len + 1, fullpath.length() - base_len); - return delet; +static std::vector expand_cmake_path(const fs::path &source_path, const fs::path &toml_dir, bool is_root_project) { + auto is_subdir = [](fs::path p, const fs::path &root) { + while (true) { + if (p == root) { + return true; + } + auto parent = p.parent_path(); + if (parent == p) { + break; + } + p = parent; + } + return false; }; + if (!is_subdir(fs::absolute(toml_dir / source_path), toml_dir)) { + throw std::runtime_error("Path traversal is not allowed: " + source_path.string()); + } - auto stem = name.filename().stem().string(); - auto ext = name.extension(); + // Split the path at the first period (since fs::path::stem() and fs::path::extension() split at the last period) + std::string stem, extension; + auto filename = source_path.filename().string(); + auto dot_position = filename.find('.'); + if (dot_position != std::string::npos) { + stem = filename.substr(0, dot_position); + extension = filename.substr(dot_position); + } else { + stem = filename; + } - if (is_root_project && stem == "**" && name == name.filename()) { - throw std::runtime_error("Recursive globbing not allowed in project root: " + name.string()); + if (is_root_project && stem == "**" && !source_path.has_parent_path()) { + throw std::runtime_error("Recursive globbing not allowed in project root: " + source_path.string()); } + auto has_extension = [](const fs::path &file_path, const std::string &extension) { + auto path = file_path.string(); + return path.rfind(extension) == path.length() - extension.length(); + }; + + std::vector paths; if (stem == "*") { - for (const auto &f : fs::directory_iterator(toml_dir / name.parent_path(), fs::directory_options::follow_directory_symlink)) { - if (!f.is_directory() && f.path().extension() == ext) { - temp.push_back(extract_suffix(toml_dir, f)); + for (const auto &f : fs::directory_iterator(toml_dir / source_path.parent_path(), fs::directory_options::follow_directory_symlink)) { + if (!f.is_directory() && has_extension(f.path(), extension)) { + paths.push_back(fs::relative(f, toml_dir)); } } } else if (stem == "**") { - for (const auto &f : fs::recursive_directory_iterator(toml_dir / name.parent_path(), fs::directory_options::follow_directory_symlink)) { - if (!f.is_directory() && f.path().extension() == ext) { - temp.push_back(extract_suffix(toml_dir, f.path())); + for (const auto &f : + fs::recursive_directory_iterator(toml_dir / source_path.parent_path(), fs::directory_options::follow_directory_symlink)) { + if (!f.is_directory() && has_extension(f.path(), extension)) { + paths.push_back(fs::relative(f, toml_dir)); } } } else { - temp.push_back(name.string()); + paths.push_back(source_path); } - // Normalize all paths to work with CMake (it needs a / on Windows as well) - for (auto &path : temp) { - std::replace(path.begin(), path.end(), '\\', '/'); - } - // Sort paths alphabetically for consistent cross-OS generation - std::sort(temp.begin(), temp.end()); - return temp; + + return paths; } static std::vector expand_cmake_paths(const std::vector &sources, const fs::path &toml_dir, bool is_root_project) { - // TODO: add duplicate checking - std::vector result; + std::vector paths; for (const auto &src : sources) { auto expanded = expand_cmake_path(src, toml_dir, is_root_project); for (const auto &f : expanded) { - result.push_back(f); + paths.push_back(f.string()); } } - return result; + + // Normalize all paths to work with CMake (it needs a / on Windows as well) + for (auto &path : paths) { + std::replace(path.begin(), path.end(), '\\', '/'); + } + + // Sort paths alphabetically for consistent cross-OS generation + std::sort(paths.begin(), paths.end()); + + // TODO: remove duplicates + + return paths; } static void create_file(const fs::path &path, const std::string &contents) { @@ -674,7 +702,7 @@ void generate_cmake(const char *path, const parser::Project *parent_project) { parser::Project project(parent_project, path, false); - for (auto const &lang : project.project_languages) { + for (const auto &lang : project.project_languages) { if (known_languages.find(lang) == known_languages.end()) { if (project.project_allow_unknown_languages) { printf("[warning] Unknown language '%s' specified\n", lang.c_str()); diff --git a/tests/globbing/mylib/include/mylib/mylib.hpp b/tests/globbing/mylib/include/mylib/mylib.hpp index 3774e8f..e449c9b 100644 --- a/tests/globbing/mylib/include/mylib/mylib.hpp +++ b/tests/globbing/mylib/include/mylib/mylib.hpp @@ -4,4 +4,4 @@ namespace mylib { std::string message(); -} +} // namespace mylib