diff options
| -rw-r--r-- | src/fish.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fish.cpp b/src/fish.cpp index bb898be5..17cd1f16 100644 --- a/src/fish.cpp +++ b/src/fish.cpp @@ -382,7 +382,7 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *cmds) case 0: { fwprintf(stderr, _(L"getopt_long() unexpectedly returned zero\n")); - exit_without_destructors(127); + exit(127); } case 'c': @@ -405,8 +405,9 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *cmds) } else { - debug(0, _(L"Invalid value '%s' for debug level switch"), optarg); - exit_without_destructors(1); + fwprintf(stderr, _(L"Invalid value '%s' for debug level switch"), + optarg); + exit(1); } break; } @@ -444,15 +445,15 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *cmds) case 'v': { - fwprintf(stderr, _(L"%s, version %s\n"), PACKAGE_NAME, + fwprintf(stdout, _(L"%s, version %s\n"), PACKAGE_NAME, get_fish_version()); - exit_without_destructors(0); + exit(0); } default: { // We assume getopt_long() has already emitted a diagnostic msg. - exit_without_destructors(1); + exit(1); } } |