diff options
| author | Guy Harris <guy@alum.mit.edu> | 2005-12-21 08:59:52 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2005-12-21 08:59:52 +0000 |
| commit | c9b702ba1af50d483d5cd8048bb808a2f577e6b8 (patch) | |
| tree | 7902e04f919aedffa340a284a670ed1324f7526b /tethereal.c | |
| parent | 8aca1c1c529878989aebfe6c1d3f9c5e0c8dc531 (diff) | |
| download | wireshark-c9b702ba1af50d483d5cd8048bb808a2f577e6b8.tar.gz wireshark-c9b702ba1af50d483d5cd8048bb808a2f577e6b8.tar.bz2 wireshark-c9b702ba1af50d483d5cd8048bb808a2f577e6b8.zip | |
Provide not only copyright information, but a GPL blurb, in all the
version/usage messages.
Put newlines at the end of various version strings.
svn path=/trunk/; revision=16870
Diffstat (limited to 'tethereal.c')
| -rw-r--r-- | tethereal.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/tethereal.c b/tethereal.c index 8f004c2502..fd371acc2c 100644 --- a/tethereal.c +++ b/tethereal.c @@ -194,11 +194,16 @@ print_usage(gboolean print_ver) if (print_ver) { output = stdout; - fprintf(output, "This is t" PACKAGE " " VERSION "%s" - "\n (C) 1998-2005 Gerald Combs <gerald@ethereal.com>" - "\n%s\n%s\n", - - svnversion, comp_info_str->str, runtime_info_str->str); + fprintf(output, "This is t" PACKAGE " " VERSION "%s\n" + "\n" + "%s" + "\n" + "%s" + "\n" + "%s", + + svnversion, get_copyright_info(), comp_info_str->str, + runtime_info_str->str); } else { output = stderr; } @@ -952,8 +957,15 @@ main(int argc, char *argv[]) } break; case 'v': /* Show version and exit */ - printf("t" PACKAGE " " VERSION "%s\n%s\n%s\n", - svnversion, comp_info_str->str, runtime_info_str->str); + printf("t" PACKAGE " " VERSION "%s\n" + "\n" + "%s" + "\n" + "%s" + "\n" + "%s", + svnversion, get_copyright_info(), comp_info_str->str, + runtime_info_str->str); exit(0); break; case 'w': /* Write to capture file xxx */ |