github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2008-09-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com> 

When error occurred while aria2 was parsing an .aria2.conf file, 
print
	the usage of the option that caused error.
	* src/option_processing.cc
pull/1/head
Tatsuhiro Tsujikawa 2008-09-27 04:54:15 +00:00
parent 327cbcb1eb
commit 16d725b96d
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2008-09-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
When error occurred while aria2 was parsing an .aria2.conf file, print
the usage of the option that caused error.
* src/option_processing.cc
2008-09-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Fixed compile error on OptionHandlerException
* src/Makefile.am
* src/OptionHandlerException.cc
* src/OptionHandlerException.h
2008-09-27 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Moved message of the error to OptionHandlerException.h

9
src/option_processing.cc
View File

@ -504,6 +504,13 @@ Option* option_processing(int argc, char* const argv[])
std::ifstream cfstream(cfname.c_str());
try {
oparser.parse(op, cfstream);
} catch(OptionHandlerException& e) {
std::cerr << "Parse error in " << cfname << "\n"
<< e.stackTrace() << "\n"
<< "Usage:" << "\n"
<< oparser.findByName(e.getOptionName())->getDescription()
<< std::endl;
exit(EXIT_FAILURE);
} catch(Exception& e) {
std::cerr << "Parse error in " << cfname << "\n"
<< e.stackTrace() << std::endl;
@ -521,7 +528,7 @@ Option* option_processing(int argc, char* const argv[])
oparser.parse(op, cmdstream);
} catch(OptionHandlerException& e) {
std::cerr << e.stackTrace() << "\n"
<< "Usage:\n"
<< "Usage:" << "\n"
<< oparser.findByName(e.getOptionName())->getDescription()
<< std::endl;
exit(EXIT_FAILURE);