diff options
author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-30 15:55:53 +0000 |
---|---|---|
committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2011-11-30 15:55:53 +0000 |
commit | bdd62e33aa6af1502cc5c0e99fedf29604c3b455 (patch) | |
tree | 6f63f88fad23baf477357ddb27607019e98a2a0b /mergecap.c | |
parent | 98edb1cbb43957d310ff3712b91870fffc9c289c (diff) |
Hopefully clarify usage a bit to indicate multiple infile's can be specified to be merged. Also, add GPL and copyright info.
svn path=/trunk/; revision=40051
Diffstat (limited to 'mergecap.c')
-rw-r--r-- | mergecap.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index 77bc156f96..997613c31a 100644 --- a/mergecap.c +++ b/mergecap.c @@ -2,7 +2,25 @@ * * $Id$ * - * Written by Scott Renfro <scott@renfro.org> based on + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Mergecap written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris * */ @@ -99,7 +117,7 @@ usage(void) fprintf(stderr, "Merge two or more capture files into one.\n"); fprintf(stderr, "See http://www.wireshark.org for more information.\n"); fprintf(stderr, "\n"); - fprintf(stderr, "Usage: mergecap [options] -w <outfile>|- <infile> ...\n"); + fprintf(stderr, "Usage: mergecap [options] -w <outfile>|- <infile> [<infile> ...]\n"); fprintf(stderr, "\n"); fprintf(stderr, "Output:\n"); fprintf(stderr, " -a concatenate rather than merge files.\n"); |