diff options
| -rw-r--r-- | samples/pdfium_test.cc | 12 | ||||
| -rw-r--r-- | testing/utils/path_service.cpp | 11 | ||||
| -rw-r--r-- | testing/utils/path_service.h | 3 |
3 files changed, 19 insertions, 7 deletions
diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 347982cf09..c7c1a3af75 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -33,6 +33,7 @@ #include "samples/pdfium_test_event_helper.h" #include "samples/pdfium_test_write_helper.h" #include "testing/test_support.h" +#include "testing/utils/path_service.h" #include "third_party/base/logging.h" #include "third_party/base/optional.h" @@ -325,7 +326,7 @@ bool ParseCommandLine(const std::vector<std::string>& args, return false; } options->output_format = OUTPUT_SKP; -#endif +#endif // PDF_ENABLE_SKIA } else if (cur_arg.size() > 11 && cur_arg.compare(0, 11, "--font-dir=") == 0) { if (!options->font_directory.empty()) { @@ -338,6 +339,13 @@ bool ParseCommandLine(const std::vector<std::string>& args, fprintf(stderr, "Failed to expand --font-dir, %s\n", path.c_str()); return false; } + + if (!PathService::DirectoryExists(expanded_path.value())) { + fprintf(stderr, "--font-dir, %s, appears to not be a directory\n", + path.c_str()); + return false; + } + options->font_directory = expanded_path.value(); #ifdef _WIN32 @@ -763,7 +771,7 @@ void RenderPdf(const std::string& name, void ShowConfig() { std::string config; std::string maybe_comma; -#if PDF_ENABLE_V8 +#ifdef PDF_ENABLE_V8 config.append(maybe_comma); config.append("V8"); maybe_comma = ","; diff --git a/testing/utils/path_service.cpp b/testing/utils/path_service.cpp index 2ded0ed3b1..5e1ce39602 100644 --- a/testing/utils/path_service.cpp +++ b/testing/utils/path_service.cpp @@ -35,7 +35,10 @@ int CallStat(const char* path, stat_wrapper_t* sb) { } #endif -bool DirectoryExists(const std::string& path) { +} // namespace + +// static +bool PathService::DirectoryExists(const std::string& path) { #ifdef _WIN32 DWORD fileattr = GetFileAttributesA(path.c_str()); if (fileattr != INVALID_FILE_ATTRIBUTES) @@ -49,8 +52,6 @@ bool DirectoryExists(const std::string& path) { #endif } -} // namespace - // static bool PathService::EndsWithSeparator(const std::string& path) { return path.size() > 1 && path[path.size() - 1] == PATH_SEPARATOR; @@ -127,7 +128,7 @@ bool PathService::GetTestDataDir(std::string* path) { potential_path.append("testing"); potential_path.push_back(PATH_SEPARATOR); potential_path.append("resources"); - if (DirectoryExists(potential_path)) { + if (PathService::DirectoryExists(potential_path)) { *path = potential_path; return true; } @@ -140,7 +141,7 @@ bool PathService::GetTestDataDir(std::string* path) { potential_path.append("testing"); potential_path.push_back(PATH_SEPARATOR); potential_path.append("resources"); - if (DirectoryExists(potential_path)) { + if (PathService::DirectoryExists(potential_path)) { *path = potential_path; return true; } diff --git a/testing/utils/path_service.h b/testing/utils/path_service.h index fc0042ca17..63df808dae 100644 --- a/testing/utils/path_service.h +++ b/testing/utils/path_service.h @@ -16,6 +16,9 @@ // Get the various file directory and path information. class PathService { public: + // Return true when the path is a directory that exists. + static bool DirectoryExists(const std::string& path); + // Return true when the path ends with a path separator. static bool EndsWithSeparator(const std::string& path); |