1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: uses namespaces in help output

Browse Source
This commit is contained in:
Chuck Craft 2024-11-15 18:24:14 -06:00 committed by AndersBroman
parent c1d34fc71f
commit 38a522373b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/commandline.c
View File

@ -68,7 +68,9 @@ commandline_print_usage(bool for_help_option) {
output = stderr; output = stderr;
} }
fprintf(output, "\n"); fprintf(output, "\n");
fprintf(output, "Usage: wireshark [options] ... [ <infile> ]\n"); char *namespace_lower = g_ascii_strdown(get_configuration_namespace(), -1);
fprintf(output, "Usage: %s [options] ... [ <infile> ]\n", namespace_lower);
g_free(namespace_lower);
fprintf(output, "\n"); fprintf(output, "\n");
#ifdef HAVE_LIBPCAP #ifdef HAVE_LIBPCAP
@ -133,7 +135,7 @@ commandline_print_usage(bool for_help_option) {
fprintf(output, "\n"); fprintf(output, "\n");
fprintf(output, "Processing:\n"); fprintf(output, "Processing:\n");
fprintf(output, " -R <read filter>, --read-filter <read filter>\n"); fprintf(output, " -R <read filter>, --read-filter <read filter>\n");
fprintf(output, " packet filter in Wireshark display filter syntax\n"); fprintf(output, " packet filter in display filter (wireshark-filter(4)) syntax\n");
fprintf(output, " -n disable all name resolutions (def: all enabled)\n"); fprintf(output, " -n disable all name resolutions (def: all enabled)\n");
// Note: the order of the flags here matches the options in the settings dialog e.g. "dsN" only have an effect if "n" is set // Note: the order of the flags here matches the options in the settings dialog e.g. "dsN" only have an effect if "n" is set
fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mtndsNvg\"\n"); fprintf(output, " -N <name resolve flags> enable specific name resolution(s): \"mtndsNvg\"\n");
@ -196,7 +198,7 @@ commandline_print_usage(bool for_help_option) {
#ifndef _WIN32 #ifndef _WIN32
fprintf(output, " --display <X display> X display to use\n"); fprintf(output, " --display <X display> X display to use\n");
#endif #endif
fprintf(output, " --fullscreen start Wireshark in full screen\n"); fprintf(output, " --fullscreen start %s in full screen\n", get_configuration_namespace());
#ifdef _WIN32 #ifdef _WIN32
destroy_console(); destroy_console();
@ -222,7 +224,7 @@ static const char optstring[] = OPTSTRING;
#ifndef HAVE_LIBPCAP #ifndef HAVE_LIBPCAP
static void print_no_capture_support_error(void) static void print_no_capture_support_error(void)
{ {
cmdarg_err("This version of Wireshark was not built with support for capturing packets."); cmdarg_err("This version of %s was not built with support for capturing packets.", get_configuration_namespace());
} }
#endif #endif
@ -385,7 +387,7 @@ void commandline_early_options(int argc, char *argv[])
#ifndef HAVE_LUA #ifndef HAVE_LUA
if (ex_opt_count("lua_script") > 0) { if (ex_opt_count("lua_script") > 0) {
cmdarg_err("This version of Wireshark was not built with support for Lua scripting."); cmdarg_err("This version of %s was not built with support for Lua scripting.", get_configuration_namespace());
exit(1); exit(1);
} }
#endif #endif
@ -646,9 +648,11 @@ void commandline_other_options(int argc, char *argv[], bool opt_reset)
part of a tap filter. Instead, we just add the argument part of a tap filter. Instead, we just add the argument
to a list of stat arguments. */ to a list of stat arguments. */
if (strcmp("help", ws_optarg) == 0) { if (strcmp("help", ws_optarg) == 0) {
fprintf(stderr, "wireshark: The available statistics for the \"-z\" option are:\n"); char *namespace_lower = g_ascii_strdown(get_configuration_namespace(), -1);
list_stat_cmd_args(); fprintf(stderr, "%s: The available statistics for the \"-z\" option are:\n", namespace_lower);
exit_application(0); g_free(namespace_lower);
list_stat_cmd_args();
exit_application(0);
} }
if (!process_stat_cmd_arg(ws_optarg)) { if (!process_stat_cmd_arg(ws_optarg)) {
cmdarg_err("Invalid -z argument."); cmdarg_err("Invalid -z argument.");