* 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.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Mergecap written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
#include <errno.h>
#include <glib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_LIBZ
-#include <zlib.h> /* to get the libz version number */
-#endif
-
#include <string.h>
-#include "wtap.h"
+
+#include <wiretap/wtap.h>
#ifndef HAVE_GETOPT_LONG
#include <wsutil/wsgetopt.h>
#endif
#include <wsutil/clopts_common.h>
-#include <wsutil/strnatcmp.h>
-#include <wsutil/file_util.h>
#include <wsutil/cmdarg_err.h>
#include <wsutil/crash_info.h>
-#include <wsutil/ws_version_info.h>
-
-#include <wiretap/merge.h>
+#include <wsutil/filesystem.h>
+#include <wsutil/file_util.h>
+#include <wsutil/privileges.h>
+#include <wsutil/strnatcmp.h>
+#include <version_info.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
+#ifdef HAVE_PLUGINS
+#include <wsutil/plugins.h>
#endif
+#include <wsutil/report_message.h>
+
+#include <wiretap/merge.h>
+
#ifdef _WIN32
#include <wsutil/unicode-utils.h>
#endif /* _WIN32 */
+#include "ui/failure_message.h"
+
/*
* Show the usage
*/
fprintf(output, " -w <outfile>|- set the output filename to <outfile> or '-' for stdout.\n");
fprintf(output, " -F <capture type> set the output file type; default is pcapng.\n");
fprintf(output, " an empty \"-F\" option will list the file types.\n");
- fprintf(output, " -T <encap type> set the output file encapsulation type;\n");
- fprintf(output, " default is the same as the first input file.\n");
- fprintf(output, " an empty \"-T\" option will list the encapsulation types.\n");
+ fprintf(output, " -I <IDB merge mode> set the merge mode for Interface Description Blocks; default is 'all'.\n");
+ fprintf(output, " an empty \"-I\" option will list the merge modes.\n");
fprintf(output, "\n");
fprintf(output, "Miscellaneous:\n");
fprintf(output, " -h display this help and exit.\n");
((const struct string_elem *)b)->sstr);
}
-static gint
-string_nat_compare(gconstpointer a, gconstpointer b)
-{
- return ws_ascii_strnatcmp(((const struct string_elem *)a)->sstr,
- ((const struct string_elem *)b)->sstr);
-}
-
static void
string_elem_print(gpointer data, gpointer not_used _U_)
{
((struct string_elem *)data)->lstr);
}
+/*
+ * General errors and warnings are reported with an console message
+ * in mergecap.
+ */
+static void
+failure_warning_message(const char *msg_format, va_list ap)
+{
+ fprintf(stderr, "mergecap: ");
+ vfprintf(stderr, msg_format, ap);
+ fprintf(stderr, "\n");
+}
+
static void
list_capture_types(void) {
int i;
}
static void
-list_encap_types(void) {
+list_idb_merge_modes(void) {
int i;
- struct string_elem *encaps;
- GSList *list = NULL;
- encaps = g_new(struct string_elem,WTAP_NUM_ENCAP_TYPES);
- fprintf(stderr, "mergecap: The available encapsulation types for the \"-T\" flag are:\n");
- for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
- encaps[i].sstr = wtap_encap_short_string(i);
- if (encaps[i].sstr != NULL) {
- encaps[i].lstr = wtap_encap_string(i);
- list = g_slist_insert_sorted(list, &encaps[i], string_nat_compare);
- }
+ fprintf(stderr, "mergecap: The available IDB merge modes for the \"-I\" flag are:\n");
+ for (i = 0; i < IDB_MERGE_MODE_MAX; i++) {
+ fprintf(stderr, " %s\n", merge_idb_merge_mode_to_string(i));
}
- g_slist_foreach(list, string_elem_print, NULL);
- g_slist_free(list);
- g_free(encaps);
}
-static void
-get_mergecap_compiled_info(GString *str)
+static gboolean
+merge_callback(merge_event event, int num,
+ const merge_in_file_t in_files[], const guint in_file_count,
+ void *data _U_)
{
- /* LIBZ */
- g_string_append(str, ", ");
-#ifdef HAVE_LIBZ
- g_string_append(str, "with libz ");
-#ifdef ZLIB_VERSION
- g_string_append(str, ZLIB_VERSION);
-#else /* ZLIB_VERSION */
- g_string_append(str, "(version unknown)");
-#endif /* ZLIB_VERSION */
-#else /* HAVE_LIBZ */
- g_string_append(str, "without libz");
-#endif /* HAVE_LIBZ */
-}
+ guint i;
-static void
-get_mergecap_runtime_info(GString *str)
-{
- /* zlib */
-#if defined(HAVE_LIBZ) && !defined(_WIN32)
- g_string_append_printf(str, ", with libz %s", zlibVersion());
-#endif
+ switch (event) {
+
+ case MERGE_EVENT_INPUT_FILES_OPENED:
+ for (i = 0; i < in_file_count; i++) {
+ fprintf(stderr, "mergecap: %s is type %s.\n", in_files[i].filename,
+ wtap_file_type_subtype_string(wtap_file_type_subtype(in_files[i].wth)));
+ }
+ break;
+
+ case MERGE_EVENT_FRAME_TYPE_SELECTED:
+ /* for this event, num = frame_type */
+ if (num == WTAP_ENCAP_PER_PACKET) {
+ /*
+ * Find out why we had to choose WTAP_ENCAP_PER_PACKET.
+ */
+ int first_frame_type, this_frame_type;
+
+ first_frame_type = wtap_file_encap(in_files[0].wth);
+ for (i = 1; i < in_file_count; i++) {
+ this_frame_type = wtap_file_encap(in_files[i].wth);
+ if (first_frame_type != this_frame_type) {
+ fprintf(stderr, "mergecap: multiple frame encapsulation types detected\n");
+ fprintf(stderr, " defaulting to WTAP_ENCAP_PER_PACKET\n");
+ fprintf(stderr, " %s had type %s (%s)\n",
+ in_files[0].filename,
+ wtap_encap_string(first_frame_type),
+ wtap_encap_short_string(first_frame_type));
+ fprintf(stderr, " %s had type %s (%s)\n",
+ in_files[i].filename,
+ wtap_encap_string(this_frame_type),
+ wtap_encap_short_string(this_frame_type));
+ break;
+ }
+ }
+ }
+ fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
+ wtap_encap_string(num),
+ wtap_encap_short_string(num));
+ break;
+
+ case MERGE_EVENT_READY_TO_MERGE:
+ fprintf(stderr, "mergecap: ready to merge records\n");
+ break;
+
+ case MERGE_EVENT_RECORD_WAS_READ:
+ /* for this event, num = count */
+ fprintf(stderr, "Record: %d\n", num);
+ break;
+
+ case MERGE_EVENT_DONE:
+ fprintf(stderr, "mergecap: merging complete\n");
+ break;
+ }
+
+ /* false = do not stop merging */
+ return FALSE;
}
-int
-main(int argc, char *argv[])
+static int
+real_main(int argc, char *argv[])
{
GString *comp_info_str;
GString *runtime_info_str;
+ char *init_progfile_dir_error;
int opt;
static const struct option long_options[] = {
- {(char *)"help", no_argument, NULL, 'h'},
- {(char *)"version", no_argument, NULL, 'V'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
{0, 0, 0, 0 }
};
gboolean do_append = FALSE;
gboolean verbose = FALSE;
int in_file_count = 0;
- guint snaplen = 0;
+ guint32 snaplen = 0;
#ifdef PCAP_NG_DEFAULT
int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcap format */
#else
int file_type = WTAP_FILE_TYPE_SUBTYPE_PCAP; /* default to pcapng format */
#endif
- int frame_type = -2;
- int out_fd;
- merge_in_file_t *in_files = NULL, *in_file;
- int i;
- struct wtap_pkthdr *phdr, snap_phdr;
- wtap_dumper *pdh;
- int open_err, read_err = 0, write_err, close_err;
- gchar *err_info, *write_err_info = NULL;
+ int err = 0;
+ gchar *err_info = NULL;
int err_fileno;
+ guint32 err_framenum;
char *out_filename = NULL;
- gboolean got_read_error = FALSE, got_write_error = FALSE;
- int count;
+ merge_result status = MERGE_OK;
+ idb_merge_mode mode = IDB_MERGE_MODE_MAX;
+ merge_progress_callback_t cb;
cmdarg_err_init(mergecap_cmdarg_err, mergecap_cmdarg_err_cont);
#ifdef _WIN32
- arg_list_utf_16to8(argc, argv);
create_app_running_mutex();
#endif /* _WIN32 */
/* Get the compile-time version information string */
- comp_info_str = get_compiled_version_info(NULL, get_mergecap_compiled_info);
+ comp_info_str = get_compiled_version_info(NULL, NULL);
/* Get the run-time version information string */
- runtime_info_str = get_runtime_version_info(get_mergecap_runtime_info);
+ runtime_info_str = get_runtime_version_info(NULL);
/* Add it to the information to be reported on a crash. */
ws_add_crash_info("Mergecap (Wireshark) %s\n"
"\n"
"%s",
get_ws_vcs_version_info(), comp_info_str->str, runtime_info_str->str);
+ g_string_free(comp_info_str, TRUE);
+ g_string_free(runtime_info_str, TRUE);
+
+ /*
+ * Get credential information for later use.
+ */
+ init_process_policies();
+
+ /*
+ * Attempt to get the pathname of the directory containing the
+ * executable file.
+ */
+ init_progfile_dir_error = init_progfile_dir(argv[0]);
+ if (init_progfile_dir_error != NULL) {
+ fprintf(stderr,
+ "mergecap: Can't get pathname of directory containing the mergecap program: %s.\n",
+ init_progfile_dir_error);
+ g_free(init_progfile_dir_error);
+ }
+
+ init_report_message(failure_warning_message, failure_warning_message,
+ NULL, NULL, NULL);
+
+ wtap_init(TRUE);
/* Process the options first */
- while ((opt = getopt_long(argc, argv, "aF:hs:T:vVw:", long_options, NULL)) != -1) {
+ while ((opt = getopt_long(argc, argv, "aF:hI:s:vVw:", long_options, NULL)) != -1) {
switch (opt) {
case 'a':
fprintf(stderr, "mergecap: \"%s\" isn't a valid capture file type\n",
optarg);
list_capture_types();
- exit(1);
+ status = MERGE_ERR_INVALID_OPTION;
+ goto clean_exit;
}
break;
case 'h':
printf("Mergecap (Wireshark) %s\n"
"Merge two or more capture files into one.\n"
- "See http://www.wireshark.org for more information.\n",
+ "See https://www.wireshark.org for more information.\n",
get_ws_vcs_version_info());
print_usage(stdout);
- exit(0);
+ goto clean_exit;
break;
- case 's':
- snaplen = get_positive_int(optarg, "snapshot length");
- break;
-
- case 'T':
- frame_type = wtap_short_string_to_encap(optarg);
- if (frame_type < 0) {
- fprintf(stderr, "mergecap: \"%s\" isn't a valid encapsulation type\n",
+ case 'I':
+ mode = merge_string_to_idb_merge_mode(optarg);
+ if (mode == IDB_MERGE_MODE_MAX) {
+ fprintf(stderr, "mergecap: \"%s\" isn't a valid IDB merge mode\n",
optarg);
- list_encap_types();
- exit(1);
+ list_idb_merge_modes();
+ status = MERGE_ERR_INVALID_OPTION;
+ goto clean_exit;
}
break;
+ case 's':
+ snaplen = get_nonzero_guint32(optarg, "snapshot length");
+ break;
+
case 'v':
verbose = TRUE;
break;
case 'V':
+ comp_info_str = get_compiled_version_info(NULL, NULL);
+ runtime_info_str = get_runtime_version_info(NULL);
show_version("Mergecap (Wireshark)", comp_info_str, runtime_info_str);
g_string_free(comp_info_str, TRUE);
g_string_free(runtime_info_str, TRUE);
- exit(0);
+ goto clean_exit;
break;
case 'w':
case'F':
list_capture_types();
break;
- case'T':
- list_encap_types();
+ case'I':
+ list_idb_merge_modes();
break;
default:
print_usage(stderr);
}
- exit(1);
+ status = MERGE_ERR_INVALID_OPTION;
+ goto clean_exit;
break;
}
}
+ cb.callback_func = merge_callback;
+ cb.data = NULL;
+
/* check for proper args; at a minimum, must have an output
* filename and one input file
*/
if (!out_filename) {
fprintf(stderr, "mergecap: an output filename must be set with -w\n");
fprintf(stderr, " run with -h for help\n");
- return 1;
+ status = MERGE_ERR_INVALID_OPTION;
+ goto clean_exit;
}
if (in_file_count < 1) {
fprintf(stderr, "mergecap: No input files were specified\n");
return 1;
}
- /* open the input files */
- if (!merge_open_in_files(in_file_count, &argv[optind], &in_files,
- &open_err, &err_info, &err_fileno)) {
- fprintf(stderr, "mergecap: Can't open %s: %s\n", argv[optind + err_fileno],
- wtap_strerror(open_err));
- if (err_info != NULL) {
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- }
- return 2;
+ /* setting IDB merge mode must use PCAPNG output */
+ if (mode != IDB_MERGE_MODE_MAX && file_type != WTAP_FILE_TYPE_SUBTYPE_PCAPNG) {
+ fprintf(stderr, "The IDB merge mode can only be used with PCAPNG output format\n");
+ status = MERGE_ERR_INVALID_OPTION;
+ goto clean_exit;
}
- if (verbose) {
- for (i = 0; i < in_file_count; i++)
- fprintf(stderr, "mergecap: %s is type %s.\n", argv[optind + i],
- wtap_file_type_subtype_string(wtap_file_type_subtype(in_files[i].wth)));
- }
-
- if (snaplen == 0) {
- /*
- * Snapshot length not specified - default to the maximum of the
- * snapshot lengths of the input files.
- */
- snaplen = merge_max_snapshot_length(in_file_count, in_files);
- }
-
- /* set the outfile frame type */
- if (frame_type == -2) {
- /*
- * Default to the appropriate frame type for the input files.
- */
- frame_type = merge_select_frame_type(in_file_count, in_files);
- if (verbose) {
- if (frame_type == WTAP_ENCAP_PER_PACKET) {
- /*
- * Find out why we had to choose WTAP_ENCAP_PER_PACKET.
- */
- int first_frame_type, this_frame_type;
-
- first_frame_type = wtap_file_encap(in_files[0].wth);
- for (i = 1; i < in_file_count; i++) {
- this_frame_type = wtap_file_encap(in_files[i].wth);
- if (first_frame_type != this_frame_type) {
- fprintf(stderr, "mergecap: multiple frame encapsulation types detected\n");
- fprintf(stderr, " defaulting to WTAP_ENCAP_PER_PACKET\n");
- fprintf(stderr, " %s had type %s (%s)\n",
- in_files[0].filename,
- wtap_encap_string(first_frame_type),
- wtap_encap_short_string(first_frame_type));
- fprintf(stderr, " %s had type %s (%s)\n",
- in_files[i].filename,
- wtap_encap_string(this_frame_type),
- wtap_encap_short_string(this_frame_type));
- break;
- }
- }
- }
- fprintf(stderr, "mergecap: selected frame_type %s (%s)\n",
- wtap_encap_string(frame_type),
- wtap_encap_short_string(frame_type));
- }
+ /* if they didn't set IDB merge mode, set it to our default */
+ if (mode == IDB_MERGE_MODE_MAX) {
+ mode = IDB_MERGE_MODE_ALL_SAME;
}
/* open the outfile */
- if (strncmp(out_filename, "-", 2) == 0) {
- /* use stdout as the outfile */
- out_fd = 1 /*stdout*/;
- } else {
- /* open the outfile */
- out_fd = ws_open(out_filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644);
- if (out_fd == -1) {
- fprintf(stderr, "mergecap: Couldn't open output file %s: %s\n",
- out_filename, g_strerror(errno));
- exit(1);
- }
- }
-
- /* prepare the outfile */
- if(file_type == WTAP_FILE_TYPE_SUBTYPE_PCAPNG ){
- wtapng_section_t *shb_hdr;
- GString *comment_gstr;
-
- shb_hdr = g_new(wtapng_section_t,1);
- comment_gstr = g_string_new("File created by merging: \n");
-
- for (i = 0; i < in_file_count; i++) {
- g_string_append_printf(comment_gstr, "File%d: %s \n",i+1,in_files[i].filename);
- }
- shb_hdr->section_length = -1;
- /* options */
- shb_hdr->opt_comment = comment_gstr->str; /* NULL if not available */
- shb_hdr->shb_hardware = NULL; /* NULL if not available, UTF-8 string containing the description of the hardware used to create this section. */
- shb_hdr->shb_os = NULL; /* NULL if not available, UTF-8 string containing the name of the operating system used to create this section. */
- shb_hdr->shb_user_appl = g_strdup("mergecap"); /* NULL if not available, UTF-8 string containing the name of the application used to create this section. */
-
- pdh = wtap_dump_fdopen_ng(out_fd, file_type, frame_type, snaplen,
- FALSE /* compressed */, shb_hdr, NULL /* wtapng_iface_descriptions_t *idb_inf */, &open_err);
- g_string_free(comment_gstr, TRUE);
+ if (strcmp(out_filename, "-") == 0) {
+ /* merge the files to the standard output */
+ status = merge_files_to_stdout(file_type,
+ (const char *const *) &argv[optind],
+ in_file_count, do_append, mode, snaplen,
+ "mergecap", verbose ? &cb : NULL,
+ &err, &err_info, &err_fileno, &err_framenum);
} else {
- pdh = wtap_dump_fdopen(out_fd, file_type, frame_type, snaplen, FALSE /* compressed */, &open_err);
- }
- if (pdh == NULL) {
- merge_close_in_files(in_file_count, in_files);
- g_free(in_files);
- fprintf(stderr, "mergecap: Can't open or create %s: %s\n", out_filename,
- wtap_strerror(open_err));
- exit(1);
+ /* merge the files to the outfile */
+ status = merge_files(out_filename, file_type,
+ (const char *const *) &argv[optind], in_file_count,
+ do_append, mode, snaplen, "mergecap", verbose ? &cb : NULL,
+ &err, &err_info, &err_fileno, &err_framenum);
}
- /* do the merge (or append) */
- count = 1;
- for (;;) {
- if (do_append)
- in_file = merge_append_read_packet(in_file_count, in_files, &read_err,
- &err_info);
- else
- in_file = merge_read_packet(in_file_count, in_files, &read_err,
- &err_info);
- if (in_file == NULL) {
- /* EOF */
+ switch (status) {
+ case MERGE_OK:
break;
- }
- if (read_err != 0) {
- /* I/O error reading from in_file */
- got_read_error = TRUE;
+ case MERGE_USER_ABORTED:
+ /* we don't catch SIGINT/SIGTERM (yet?), so we couldn't have aborted */
+ g_assert(FALSE);
break;
- }
-
- if (verbose)
- fprintf(stderr, "Record: %u\n", count++);
- /* We simply write it, perhaps after truncating it; we could do other
- * things, like modify it. */
- phdr = wtap_phdr(in_file->wth);
- if (snaplen != 0 && phdr->caplen > snaplen) {
- snap_phdr = *phdr;
- snap_phdr.caplen = snaplen;
- phdr = &snap_phdr;
- }
-
- if (!wtap_dump(pdh, phdr, wtap_buf_ptr(in_file->wth), &write_err, &write_err_info)) {
- got_write_error = TRUE;
+ case MERGE_ERR_CANT_OPEN_INFILE:
+ cfile_open_failure_message("mergecap", argv[optind + err_fileno],
+ err, err_info);
break;
- }
- }
-
- merge_close_in_files(in_file_count, in_files);
- if (!got_write_error) {
- if (!wtap_dump_close(pdh, &write_err))
- got_write_error = TRUE;
- } else {
- /*
- * We already got a write error; no need to report another
- * write error on close.
- *
- * Don't overwrite the earlier write error.
- */
- (void)wtap_dump_close(pdh, &close_err);
- }
-
- if (got_read_error) {
- /*
- * Find the file on which we got the error, and report the error.
- */
- for (i = 0; i < in_file_count; i++) {
- if (in_files[i].state == GOT_ERROR) {
- fprintf(stderr, "mergecap: Error reading %s: %s\n",
- in_files[i].filename, wtap_strerror(read_err));
- if (err_info != NULL) {
- fprintf(stderr, "(%s)\n", err_info);
- g_free(err_info);
- }
- }
- }
- }
- if (got_write_error) {
- switch (write_err) {
-
- case WTAP_ERR_UNWRITABLE_ENCAP:
- /*
- * This is a problem with the particular frame we're writing and
- * the file type and subtype we're wwriting; note that, and
- * report the frame number and file type/subtype.
- */
- fprintf(stderr, "mergecap: Frame %u of \"%s\" has a network type that can't be saved in a \"%s\" file.\n",
- in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
- wtap_file_type_subtype_string(file_type));
+ case MERGE_ERR_CANT_OPEN_OUTFILE:
+ cfile_dump_open_failure_message("mergecap", out_filename, err, file_type);
break;
- case WTAP_ERR_PACKET_TOO_LARGE:
- /*
- * This is a problem with the particular frame we're writing and
- * the file type and subtype we're wwriting; note that, and
- * report the frame number and file type/subtype.
- */
- fprintf(stderr, "mergecap: Frame %u of \"%s\" is too large for a \"%s\" file.\n",
- in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
- wtap_file_type_subtype_string(file_type));
+ case MERGE_ERR_CANT_READ_INFILE:
+ cfile_read_failure_message("mergecap", argv[optind + err_fileno],
+ err, err_info);
break;
- case WTAP_ERR_UNWRITABLE_REC_TYPE:
- /*
- * This is a problem with the particular record we're writing and
- * the file type and subtype we're wwriting; note that, and
- * report the record number and file type/subtype.
- */
- fprintf(stderr, "mergecap: Record %u of \"%s\" has a record type that can't be saved in a \"%s\" file.\n",
- in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
- wtap_file_type_subtype_string(file_type));
+ case MERGE_ERR_BAD_PHDR_INTERFACE_ID:
+ cmdarg_err("Record %u of \"%s\" has an interface ID that does not match any IDB in its file.",
+ err_framenum, argv[optind + err_fileno]);
break;
- case WTAP_ERR_UNWRITABLE_REC_DATA:
- /*
- * This is a problem with the particular record we're writing and
- * the file type and subtype we're wwriting; note that, and
- * report the record number and file type/subtype.
- */
- fprintf(stderr, "mergecap: Record %u of \"%s\" has data that can't be saved in a \"%s\" file.\n(%s)\n",
- in_file ? in_file->packet_num : 0, in_file ? in_file->filename : "UNKNOWN",
- wtap_file_type_subtype_string(file_type),
- write_err_info != NULL ? write_err_info : "no information supplied");
- g_free(write_err_info);
- break;
+ case MERGE_ERR_CANT_WRITE_OUTFILE:
+ cfile_write_failure_message("mergecap", argv[optind + err_fileno],
+ out_filename, err, err_info, err_framenum,
+ file_type);
+ break;
+
+ case MERGE_ERR_CANT_CLOSE_OUTFILE:
+ cfile_close_failure_message(out_filename, err);
+ break;
default:
- fprintf(stderr, "mergecap: Error writing to outfile: %s\n",
- wtap_strerror(write_err));
+ cmdarg_err("Unknown merge_files error %d", status);
break;
- }
}
- g_free(in_files);
+clean_exit:
+ wtap_cleanup();
+ free_progdirs();
+ return (status == MERGE_OK) ? 0 : 2;
+}
+
+#ifdef _WIN32
+int
+wmain(int argc, wchar_t *wc_argv[])
+{
+ char **argv;
- return (!got_read_error && !got_write_error) ? 0 : 2;
+ argv = arg_list_utf_16to8(argc, wc_argv);
+ return real_main(argc, argv);
+}
+#else
+int
+main(int argc, char *argv[])
+{
+ return real_main(argc, argv);
}
+#endif
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
* vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
*/
-
git.samba.org / metze / wireshark / wip.git / blobdiff