third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch all exceptions not caught in exiv2 cli-tool

Browse Source 
It effectively looks the same as before, only now we don't call abort() but
instead clean up everything gracefully.
This commit is contained in:
Dan Čermák 2018-06-11 16:25:23 +02:00
parent 937a1a2bd0
commit f4e8ed2fd4
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/exiv2.cpp
View File

@ -146,30 +146,36 @@ int main(int argc, char* const argv[])
return 0;
}
// Create the required action class
Action::TaskFactory& taskFactory = Action::TaskFactory::instance();
Action::Task::AutoPtr task
= taskFactory.create(Action::TaskType(params.action_));
assert(task.get());
// Process all files
int rc = 0;
int n = 1;
int s = static_cast<int>(params.files_.size());
int w = s > 9 ? s > 99 ? 3 : 2 : 1;
for (Params::Files::const_iterator i = params.files_.begin();
i != params.files_.end(); ++i) {
if (params.verbose_) {
std::cout << _("File") << " " << std::setw(w) << std::right << n++ << "/" << s << ": "
<< *i << std::endl;
}
int ret = task->run(*i);
if (rc == 0) rc = ret;
}
taskFactory.cleanup();
params.cleanup();
Exiv2::XmpParser::terminate();
try {
// Create the required action class
Action::TaskFactory& taskFactory = Action::TaskFactory::instance();
Action::Task::AutoPtr task = taskFactory.create(Action::TaskType(params.action_));
assert(task.get());
// Process all files
int n = 1;
int s = static_cast<int>(params.files_.size());
int w = s > 9 ? s > 99 ? 3 : 2 : 1;
for (Params::Files::const_iterator i = params.files_.begin(); i != params.files_.end(); ++i) {
if (params.verbose_) {
std::cout << _("File") << " " << std::setw(w) << std::right << n++ << "/" << s << ": " << *i
<< std::endl;
}
int ret = task->run(*i);
if (rc == 0)
rc = ret;
}
taskFactory.cleanup();
params.cleanup();
Exiv2::XmpParser::terminate();
} catch (const std::exception& exc) {
std::cerr << "Uncaught exception: " << exc.what() << std::endl;
rc = 1;
}
// Return a positive one byte code for better consistency across platforms
return static_cast<unsigned int>(rc) % 256;