path: root/mergecap.c
AgeCommit message (Expand)AuthorFilesLines
2005-09-14added compression support for capture file output. The Save/As dialog now has...Ulf Lamping1-1/+1
2004-12-29Make the tone of the error messages a bit less formal, by usingGuy Harris1-3/+3
2004-10-29The common merge code merely needs to offer the abstraction of routinesGuy Harris1-33/+59
2004-10-28Make "merge_files()" and "merge_append_files()" return a tri-stateGuy Harris1-12/+40
2004-10-28Remove all the verbose-mode code from merge.c, and put most of it inGuy Harris1-14/+67
2004-10-27Change some of the merge.c APIs to return more information on failure,Guy Harris1-31/+78
2004-10-27Check whether any input files were specified, and print an error forGuy Harris1-0/+4
2004-07-18Set the svn:eol-style property on all text files to "native", so thatGuy Harris1-1/+1
2004-07-15Convert make-version.pl and the associated cvsversion.h and CVSVERSIONGerald Combs1-3/+3
2004-07-13If we fail to open the output file, report the reason why.Guy Harris1-5/+7
2004-07-12bugfix to a bug reported by jprakashbabu@hotpop.com:Ulf Lamping1-6/+6
2004-06-30Initialize "out_filename" to NULL, so it's set to NULL if it's not setGuy Harris1-3/+3
2004-06-30On at least some platforms, a #define of O_BINARY is needed even ifGuy Harris1-1/+5
2004-06-29avoid using tmpnam() for security reasons.Ulf Lamping1-4/+26
2004-06-18merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),Ulf Lamping1-351/+16
2004-03-04Undo an unnecessary changeJörg Mayer1-2/+2
2004-03-03Bill Guyton: mergecap can write to stdout by using the special filename -Jörg Mayer1-1/+6
2004-02-20Add support for a "version.conf" file in the main directory which canGerald Combs1-2/+2
2004-01-25Free the error info string after using it.Guy Harris1-1/+2
2004-01-25Have the Wiretap open, read, and seek-and-read routines return, inGuy Harris1-6/+27
2004-01-18Fix warnings found by -Wstrict-prototypesJörg Mayer1-2/+2
2004-01-18Output the result of -h to stdout, not stderrJörg Mayer1-18/+18
2004-01-18Nice rendering of the CVS version as "(cvs 200401181200003000)".Olivier Biot1-2/+6
2004-01-16In case of CVS sources, add the date of the last change to the versionJörg Mayer1-2/+3
2002-08-28Removed trailing whitespaces from .h and .c files using theJörg Mayer1-19/+19
2002-08-02Replace the types from sys/types.h and netinet/in.h by their glib.hJörg Mayer1-9/+5
2002-06-23WinPcap 2.3's <pcap.h> includes <packet32.h>, and WinPcap 2.3'sGuy Harris1-3/+3
2002-03-31From Joerg Mayer: mark function arguments as unused.Guy Harris1-2/+2
2002-02-24From Peter Valchev: fix editcap to assign the result of "getopt()" to anGuy Harris1-2/+2
2002-02-08Have Wiretap set the snapshot length to 0 if it can't be derived fromGuy Harris1-3/+9
2001-10-04Use longs as file offsets, so that on platforms with 64-bit "long" weGuy Harris1-3/+3
2001-07-20Get rid of some unused variables.Guy Harris1-4/+1
2001-07-14From Scott Renfro: correctly handle merging multiple files withGuy Harris1-7/+53
2001-07-13Update from Scott Renfro to allow mergecap to merge multiple captureGuy Harris1-140/+265
2001-07-12Mergecap utility for merging capture files, from Scott Renfro.Guy Harris1-0/+330