diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-12-12 18:16:15 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-12-13 03:16:13 +0000 |
| commit | 43dfd45faa8af0b239a671b25ab6a398fa32f5c6 (patch) | |
| tree | 3ea329a4f3f702e279169382614dcaf553e79431 /fuzz | |
| parent | a34cc98b2ac5a0ad011a1c3a40ce5e59230a9498 (diff) | |
Move more version-info-related stuff to version_info.c.
Have a ws_init_version_info() routine that, given an application name
string:
constructs the app-name-and-version-information string, and
saves it;
adds the initial crash information on platforms that support it,
and saves it.
Have show_version() use the saved information and take no arguments.
Add a show_help_header() routine to print the header for --help
command-line options, given a description of the application; it prints
the application name and version information, the description, and the
"See {wireshark.org URL}" line.
Use those routines in various places, including providing the
"application name" string in pcapng SHBs.
Change-Id: I0042a8fcc91aa919ad5c381a8b8674a007ce66df
Reviewed-on: https://code.wireshark.org/review/31029
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/fuzzshark.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/fuzz/fuzzshark.c b/fuzz/fuzzshark.c index e31d8219a5..d618b81121 100644 --- a/fuzz/fuzzshark.c +++ b/fuzz/fuzzshark.c @@ -21,7 +21,6 @@ #include <epan/epan.h> #include <wsutil/cmdarg_err.h> -#include <wsutil/crash_info.h> #include <wsutil/filesystem.h> #include <wsutil/privileges.h> #include <wsutil/report_message.h> @@ -180,8 +179,6 @@ fuzz_prefs_apply(void) static int fuzz_init(int argc _U_, char **argv) { - GString *comp_info_str; - GString *runtime_info_str; char *init_progfile_dir_error; char *err_msg = NULL; @@ -238,23 +235,9 @@ fuzz_init(int argc _U_, char **argv) if (init_progfile_dir_error != NULL) fprintf(stderr, "fuzzshark: Can't get pathname of oss-fuzzshark program: %s.\n", init_progfile_dir_error); - /* Get the compile-time version information string */ - comp_info_str = get_compiled_version_info(NULL, epan_get_compiled_version_info); - - /* Get the run-time version information string */ - runtime_info_str = get_runtime_version_info(epan_get_runtime_version_info); - - /* Add it to the information to be reported on a crash. */ - ws_add_crash_info("OSS Fuzzshark (Wireshark) %s\n" - "\n" - "%s" - "\n" - "%s", - get_ws_vcs_version_info(), - comp_info_str->str, - runtime_info_str->str); - g_string_free(comp_info_str, TRUE); - g_string_free(runtime_info_str, TRUE); + /* Initialize the version information. */ + ws_init_version_info("OSS Fuzzshark (Wireshark)", NULL, + epan_get_compiled_version_info, epan_get_runtime_version_info); init_report_message(failure_warning_message, failure_warning_message, open_failure_message, read_failure_message, write_failure_message); |