diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-07-03 01:45:32 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-07-03 08:46:01 +0000 |
commit | b4ce352539ec1e88a8002c65a38cc3029860c0e0 (patch) | |
tree | f2c702b2722c20464477e5f85cb5c80abab31915 /reordercap.c | |
parent | d70e56a733a1d432dedc0dce7fbd992ef225d0c5 (diff) |
Make --help and --version information a bit more uniform.
Have --version print the version number, the copyright information, the
"compiled with" information, the "running on/with" information, and the
compiler information.
Have --help print the version number, a one-line summary of what the
program does, a reference to http://www.wireshark.org for more
information, a Usage: line, and a list of command-line options.
This means programs doing that don't need to include version.h; that's
left up to get_ws_vcs_version_info() to do.
Change-Id: Idac641bc10e4dfd04c9914d379b3a3e0cc5ca8cb
Reviewed-on: https://code.wireshark.org/review/2794
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'reordercap.c')
-rw-r--r-- | reordercap.c | 100 |
1 files changed, 76 insertions, 24 deletions
diff --git a/reordercap.c b/reordercap.c index 7a9890e177..9246974682 100644 --- a/reordercap.c +++ b/reordercap.c @@ -36,40 +36,43 @@ #include <getopt.h> #endif +#ifdef HAVE_LIBZ +#include <zlib.h> /* to get the libz version number */ +#endif + #include "wtap.h" #ifndef HAVE_GETOPT #include "wsutil/wsgetopt.h" #endif -#include "version.h" +#include <wsutil/strnatcmp.h> +#include <wsutil/file_util.h> +#include <wsutil/crash_info.h> +#include <wsutil/copyright_info.h> +#include <wsutil/os_version_info.h> +#include <wsutil/ws_version_info.h> + +#include "version_info.h" static void -print_version(FILE *output) +show_version(GString *comp_info_str, GString *runtime_info_str) { - fprintf(output, "Reordercap %s" -#ifdef GITVERSION - " (" GITVERSION " from " GITBRANCH ")" -#endif - "\n", VERSION); + printf("Reordercap (Wireshark) %s\n" + "\n" + "%s" + "\n" + "%s" + "\n" + "%s", + get_ws_vcs_version_info(), get_copyright_info(), + comp_info_str->str, runtime_info_str->str); } /* Show command-line usage */ static void -usage(gboolean is_error) +print_usage(FILE *output) { - FILE *output; - - if (!is_error) { - output = stdout; - } - else { - output = stderr; - } - - print_version(output); - fprintf(output, "Reorder timestamps of input file frames into output file.\n"); - fprintf(output, "See http://www.wireshark.org for more information.\n"); fprintf(output, "\n"); fprintf(output, "Usage: reordercap [options] <infile> <outfile>\n"); fprintf(output, "\n"); @@ -164,6 +167,31 @@ frames_compare(gconstpointer a, gconstpointer b) return nstime_cmp(time1, time2); } +static void +get_reordercap_compiled_info(GString *str) +{ + /* LIBZ */ + g_string_append(str, ", "); +#ifdef HAVE_LIBZ + g_string_append(str, "with libz "); +#ifdef ZLIB_VERSION + g_string_append(str, ZLIB_VERSION); +#else /* ZLIB_VERSION */ + g_string_append(str, "(version unknown)"); +#endif /* ZLIB_VERSION */ +#else /* HAVE_LIBZ */ + g_string_append(str, "without libz"); +#endif /* HAVE_LIBZ */ +} + +static void +get_reordercap_runtime_info(GString *str) +{ + /* zlib */ +#if defined(HAVE_LIBZ) && !defined(_WIN32) + g_string_append_printf(str, ", with libz %s", zlibVersion()); +#endif +} /********************************************************************/ /* Main function. */ @@ -171,6 +199,8 @@ frames_compare(gconstpointer a, gconstpointer b) int main(int argc, char *argv[]) { + GString *comp_info_str; + GString *runtime_info_str; wtap *wth = NULL; wtap_dumper *pdh = NULL; Buffer buf; @@ -197,6 +227,22 @@ main(int argc, char *argv[]) char *infile; char *outfile; + /* Assemble the compile-time version information string */ + comp_info_str = g_string_new("Compiled "); + get_compiled_version_info(comp_info_str, NULL, get_reordercap_compiled_info); + + /* Assemble the run-time version information string */ + runtime_info_str = g_string_new("Running "); + get_runtime_version_info(runtime_info_str, get_reordercap_runtime_info); + + /* Add it to the information to be reported on a crash. */ + ws_add_crash_info("Reordercap (Wireshark) %s\n" + "\n" + "%s" + "\n" + "%s", + get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str); + /* Process the options first */ while ((opt = getopt_long(argc, argv, "hnv", long_options, NULL)) != -1) { switch (opt) { @@ -204,13 +250,19 @@ main(int argc, char *argv[]) write_output_regardless = FALSE; break; case 'h': - usage(FALSE); + printf("Reordercap (Wireshark) %s\n" + "Reorder timestamps of input file frames into output file.\n" + "See http://www.wireshark.org for more information.\n", + get_ws_vcs_version_info()); + print_usage(stdout); exit(0); case 'v': - print_version(stdout); + show_version(comp_info_str, runtime_info_str); + g_string_free(comp_info_str, TRUE); + g_string_free(runtime_info_str, TRUE); exit(0); case '?': - usage(TRUE); + print_usage(stderr); exit(1); } } @@ -222,7 +274,7 @@ main(int argc, char *argv[]) outfile = argv[optind+1]; } else { - usage(TRUE); + print_usage(stderr); exit(1); } |