Kaydet (Commit) f3c77010 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1338271 Uncaught exception

Change-Id: Ib2b7617f9862b904bd3d5939800244c541eba8a5
üst 0b3a807e
...@@ -16,70 +16,79 @@ ...@@ -16,70 +16,79 @@
#include "LuceneHelper.hxx" #include "LuceneHelper.hxx"
int main(int argc, char **argv) { int main(int argc, char **argv)
const std::string pLang("-lang"); {
const std::string pModule("-mod"); try
const std::string pDir("-dir"); {
const std::string pLang("-lang");
const std::string pModule("-mod");
const std::string pDir("-dir");
std::string lang; std::string lang;
std::string module; std::string module;
std::string dir; std::string dir;
bool error = false; bool error = false;
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (pLang.compare(argv[i]) == 0) { if (pLang.compare(argv[i]) == 0) {
if (i + 1 < argc) { if (i + 1 < argc) {
lang = argv[++i]; lang = argv[++i];
} else {
error = true;
}
} else if (pModule.compare(argv[i]) == 0) {
if (i + 1 < argc) {
module = argv[++i];
} else {
error = true;
}
} else if (pDir.compare(argv[i]) == 0) {
if (i + 1 < argc) {
dir = argv[++i];
} else {
error = true;
}
} else { } else {
error = true; error = true;
} }
} else if (pModule.compare(argv[i]) == 0) {
if (i + 1 < argc) {
module = argv[++i];
} else {
error = true;
}
} else if (pDir.compare(argv[i]) == 0) {
if (i + 1 < argc) {
dir = argv[++i];
} else {
error = true;
}
} else {
error = true;
} }
}
if (error) { if (error) {
std::cerr << "Error parsing command-line arguments" << std::endl; std::cerr << "Error parsing command-line arguments" << std::endl;
} }
if (error || lang.empty() || module.empty() || dir.empty()) { if (error || lang.empty() || module.empty() || dir.empty()) {
std::cerr << "Usage: HelpIndexer -lang ISOLangCode -mod HelpModule -dir Dir" << std::endl; std::cerr << "Usage: HelpIndexer -lang ISOLangCode -mod HelpModule -dir Dir" << std::endl;
return 1; return 1;
} }
OUString sDir; OUString sDir;
osl::File::getFileURLFromSystemPath( osl::File::getFileURLFromSystemPath(
OUString(dir.c_str(), dir.size(), osl_getThreadTextEncoding()), OUString(dir.c_str(), dir.size(), osl_getThreadTextEncoding()),
sDir); sDir);
OUString cwd; OUString cwd;
osl_getProcessWorkingDir(&cwd.pData); osl_getProcessWorkingDir(&cwd.pData);
osl::File::getAbsoluteFileURL(cwd, sDir, sDir); osl::File::getAbsoluteFileURL(cwd, sDir, sDir);
HelpIndexer indexer( HelpIndexer indexer(
OUString(lang.c_str(), lang.size(), osl_getThreadTextEncoding()), OUString(lang.c_str(), lang.size(), osl_getThreadTextEncoding()),
OUString(module.c_str(), module.size(), osl_getThreadTextEncoding()), OUString(module.c_str(), module.size(), osl_getThreadTextEncoding()),
sDir, sDir); sDir, sDir);
if (!indexer.indexDocuments()) { if (!indexer.indexDocuments()) {
std::cerr << OUStringToOString(indexer.getErrorMessage(), osl_getThreadTextEncoding()).getStr() << std::endl; std::cerr << OUStringToOString(indexer.getErrorMessage(), osl_getThreadTextEncoding()).getStr() << std::endl;
return 2;
}
return 0;
}
catch (std::exception& e)
{
std::cerr << "failure: " << e.what() << std::endl;
return 2; return 2;
} }
return 0;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment