forked from osmocom/wireshark
If we fail to open the output file, report the reason why.
svn path=/trunk/; revision=11371
This commit is contained in:
parent
f0fc7264f4
commit
aaac0102cb
12
mergecap.c
12
mergecap.c
|
@ -1,6 +1,6 @@
|
||||||
/* Combine two dump files, either by appending or by merging by timestamp
|
/* Combine two dump files, either by appending or by merging by timestamp
|
||||||
*
|
*
|
||||||
* $Id: mergecap.c,v 1.25 2004/07/12 21:00:40 ulfl Exp $
|
* $Id: mergecap.c,v 1.26 2004/07/13 05:58:15 guy Exp $
|
||||||
*
|
*
|
||||||
* Written by Scott Renfro <scott@renfro.org> based on
|
* Written by Scott Renfro <scott@renfro.org> based on
|
||||||
* editcap by Richard Sharpe and Guy Harris
|
* editcap by Richard Sharpe and Guy Harris
|
||||||
|
@ -13,6 +13,7 @@
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
|
@ -197,10 +198,11 @@ main(int argc, char *argv[])
|
||||||
/* open the outfile */
|
/* open the outfile */
|
||||||
out_file.fd = open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
|
out_file.fd = open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
|
||||||
}
|
}
|
||||||
if(out_file.fd == -1) {
|
if (out_file.fd == -1) {
|
||||||
fprintf(stderr, "mergecap: couldn't open output file\n");
|
fprintf(stderr, "mergecap: Couldn't open output file %s: %s\n",
|
||||||
exit(1);
|
out_filename, strerror(errno));
|
||||||
}
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
/* prepare the outfile */
|
/* prepare the outfile */
|
||||||
if (!merge_open_outfile(&out_file, merge_max_snapshot_length(in_file_count, in_files), &err)) {
|
if (!merge_open_outfile(&out_file, merge_max_snapshot_length(in_file_count, in_files), &err)) {
|
||||||
|
|
Loading…
Reference in New Issue