aboutsummaryrefslogtreecommitdiffstats
path: root/mergecap.c
Commit message (Expand)AuthorAgeFilesLines
* Ethereal->WiresharkAnders Broman2006-05-281-1/+1
* From Martin Mathieson:Anders Broman2006-03-301-2/+2
* same command line related changes as recently done with editcapUlf Lamping2006-01-101-33/+62
* replace *a lot* of file related calls by their GLib counterparts. This is nec...Ulf Lamping2005-11-061-10/+2
* added compression support for capture file output. The Save/As dialog now has...Ulf Lamping2005-09-141-1/+1
* Make the tone of the error messages a bit less formal, by usingGuy Harris2004-12-291-3/+3
* The common merge code merely needs to offer the abstraction of routinesGuy Harris2004-10-291-33/+59
* Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris2004-10-281-12/+40
* Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris2004-10-281-14/+67
* Change some of the merge.c APIs to return more information on failure,Guy Harris2004-10-271-31/+78
* Check whether any input files were specified, and print an error forGuy Harris2004-10-271-0/+4
* Set the svn:eol-style property on all text files to "native", so thatGuy Harris2004-07-181-1/+1
* Convert make-version.pl and the associated cvsversion.h and CVSVERSIONGerald Combs2004-07-151-3/+3
* If we fail to open the output file, report the reason why.Guy Harris2004-07-131-5/+7
* bugfix to a bug reported by jprakashbabu@hotpop.com:Ulf Lamping2004-07-121-6/+6
* Initialize "out_filename" to NULL, so it's set to NULL if it's not setGuy Harris2004-06-301-3/+3
* On at least some platforms, a #define of O_BINARY is needed even ifGuy Harris2004-06-301-1/+5
* avoid using tmpnam() for security reasons.Ulf Lamping2004-06-291-4/+26
* merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping2004-06-181-351/+16
* Undo an unnecessary changeJörg Mayer2004-03-041-2/+2
* Bill Guyton: mergecap can write to stdout by using the special filename -Jörg Mayer2004-03-031-1/+6
* Add support for a "version.conf" file in the main directory which canGerald Combs2004-02-201-2/+2
* Free the error info string after using it.Guy Harris2004-01-251-1/+2
* Have the Wiretap open, read, and seek-and-read routines return, inGuy Harris2004-01-251-6/+27
* Fix warnings found by -Wstrict-prototypesJörg Mayer2004-01-181-2/+2
* Output the result of -h to stdout, not stderrJörg Mayer2004-01-181-18/+18
* Nice rendering of the CVS version as "(cvs 200401181200003000)".Olivier Biot2004-01-181-2/+6
* In case of CVS sources, add the date of the last change to the versionJörg Mayer2004-01-161-2/+3
* Removed trailing whitespaces from .h and .c files using theJörg Mayer2002-08-281-19/+19
* Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer2002-08-021-9/+5
* WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3'sGuy Harris2002-06-231-3/+3
* From Joerg Mayer: mark function arguments as unused.Guy Harris2002-03-311-2/+2
* From Peter Valchev: fix editcap to assign the result of "getopt()" to anGuy Harris2002-02-241-2/+2
* Have Wiretap set the snapshot length to 0 if it can't be derived fromGuy Harris2002-02-081-3/+9
* Use longs as file offsets, so that on platforms with 64-bit "long" weGuy Harris2001-10-041-3/+3
* Get rid of some unused variables.Guy Harris2001-07-201-4/+1
* From Scott Renfro: correctly handle merging multiple files withGuy Harris2001-07-141-7/+53
* Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris2001-07-131-140/+265
* Mergecap utility for merging capture files, from Scott Renfro.Guy Harris2001-07-121-0/+330