diff options
| author | Dan Engelbrecht <[email protected]> | 2026-01-22 12:56:08 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-01-22 12:56:08 +0100 |
| commit | a735026f7376456eba7fb55e0c70c3353ea9c25a (patch) | |
| tree | 56524229d934c4e08236598ad9abb0ba6c13bc8d /src/zenserver/main.cpp | |
| parent | fixed bad merge in CHANGELOG.md (diff) | |
| download | zen-a735026f7376456eba7fb55e0c70c3353ea9c25a.tar.xz zen-a735026f7376456eba7fb55e0c70c3353ea9c25a.zip | |
hotfix 5.7.18 (#730)
* make sure we properly convert command line args for zenserver as well
* make sure we *add* wildcards/excludes in addition to defaults
Diffstat (limited to 'src/zenserver/main.cpp')
| -rw-r--r-- | src/zenserver/main.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp index 996f96da8..3a58d1f4a 100644 --- a/src/zenserver/main.cpp +++ b/src/zenserver/main.cpp @@ -19,6 +19,7 @@ #include <zencore/thread.h> #include <zencore/trace.h> #include <zentelemetry/otlptrace.h> +#include <zenutil/commandlineoptions.h> #include <zenutil/service.h> #include "diag/logging.h" @@ -195,12 +196,12 @@ AppMain(int argc, char* argv[]) } catch (const AssertException& AssertEx) { - fprintf(stderr, ZEN_APP_NAME " ERROR: Caught assert exception in main: '%s'", AssertEx.FullDescription().c_str()); + fprintf(stderr, ZEN_APP_NAME " ERROR: Caught assert exception in main: '%s'\n", AssertEx.FullDescription().c_str()); return 1; } catch (const std::exception& Ex) { - fprintf(stderr, ZEN_APP_NAME " ERROR: Caught exception in main: '%s'", Ex.what()); + fprintf(stderr, ZEN_APP_NAME " ERROR: Caught exception in main: '%s'\n", Ex.what()); return 1; } @@ -233,6 +234,8 @@ main(int argc, char* argv[]) setlocale(LC_ALL, "en_us.UTF8"); #endif // ZEN_PLATFORM_WINDOWS + zen::CommandLineConverter ArgConverter(argc, argv); + using namespace zen; using namespace std::literals; |