diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2014-07-14 00:06:32 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2014-07-14 00:06:32 +0900 |
| commit | 04caefa406d2041993eacd1b279b99f79585704d (patch) | |
| tree | b1133af1f6bf3d4eb6cfeb34e9572ff8919d478e /src | |
| parent | 4b6f4040acf73ff840ba9d54ddb35ff9772bf90e (diff) | |
Fix test failure with --enable-libaria2release-1.18.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/option_processing.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/option_processing.cc b/src/option_processing.cc index 9db33687..0f227d1c 100644 --- a/src/option_processing.cc +++ b/src/option_processing.cc @@ -186,11 +186,15 @@ error_code::Value option_processing(Option& op, bool standalone, bool noConf = false; std::string ucfname; std::stringstream cmdstream; - oparser->parseArg(cmdstream, uris, argc, argv); { // first evaluate --no-conf and --conf-path options. Option op; - oparser->parse(op, cmdstream); + if(argc == 0) { + oparser->parse(op, options); + } else { + oparser->parseArg(cmdstream, uris, argc, argv); + oparser->parse(op, cmdstream); + } noConf = op.getAsBool(PREF_NO_CONF); ucfname = op.get(PREF_CONF_PATH); if(standalone) { |
