tastytea/epubgrep
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 9 Wiki Activity

Don't crash on regex errors.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
The error will be reported once for each initial thread.

Closes: #14
This commit is contained in:
tastytea 2021-06-24 13:13:49 +02:00
parent 18c3d8f58d
commit 822bff1955
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -45,6 +45,8 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
constexpr int EXIT_FATAL{2};
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
using namespace epubgrep; using namespace epubgrep;
@ -77,7 +79,7 @@ int main(int argc, char *argv[])
{ // Exceptions we can't recover from or ones we don't know. { // Exceptions we can't recover from or ones we don't know.
LOG(log::sev::fatal) LOG(log::sev::fatal)
<< e.what() << translate(" (while parsing options)"); << e.what() << translate(" (while parsing options)");
return EXIT_FAILURE; return EXIT_FATAL;
} }
if (opts.debug) if (opts.debug)
@ -175,6 +177,11 @@ int main(int argc, char *argv[])
filepath); filepath);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
catch (const boost::regex_error &e)
{
LOG(log::sev::fatal) << e.what();
return EXIT_FATAL;
}
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -219,6 +226,10 @@ int main(int argc, char *argv[])
DEBUGLOG << "Attempting to clean up threads"; DEBUGLOG << "Attempting to clean up threads";
futures_cleanup(); futures_cleanup();
} }
if (return_code == EXIT_FATAL)
{
break;
}
futurepool.emplace_back( futurepool.emplace_back(
std::async(std::launch::async, search_file, filepath)); std::async(std::launch::async, search_file, filepath));
DEBUGLOG << "Launched new thread"; DEBUGLOG << "Launched new thread";
@ -233,6 +244,10 @@ int main(int argc, char *argv[])
} }
DEBUGLOG << "Waiting for remaining threads to finish"; DEBUGLOG << "Waiting for remaining threads to finish";
futures_cleanup(true); futures_cleanup(true);
if (return_code == EXIT_FATAL)
{
return EXIT_FATAL;
}
if (opts.json) if (opts.json)
{ {