wslog: Check if we are initialized and add missing inits

Instead of receiving the program name from GLib, pass it explicitly
to ws_log_init() instead  and use that to initialize the GLib program
name.

ws_log_parse_args() will now exit the program when it encounters an
argument error if exit_failure >= 0.

1 files changed, 7 insertions, 0 deletions

diff --git a/captype.c b/captype.c
index 37f81ff443..96edb84443 100644
--- a/captype.c
+++ b/captype.c
@@ -50,6 +50,7 @@
 
 #include <wsutil/report_message.h>
 #include <wsutil/str_util.h>
+#include <wsutil/wslog.h>
 
 #include "ui/failure_message.h"
 
@@ -119,8 +120,14 @@ main(int argc, char *argv[])
   setlocale(LC_ALL, "");
 #endif
 
+  /* Initialize log handler early so we can have proper logging during startup. */
+  ws_log_init("captype", NULL);
+
   cmdarg_err_init(captype_cmdarg_err, captype_cmdarg_err_cont);
 
+  /* Early logging command-line initialization. */
+  ws_log_parse_args(&argc, argv, vcmdarg_err, 1);
+
   /* Initialize the version information. */
   ws_init_version_info("Captype (Wireshark)", NULL, NULL, NULL);