diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-04-25 05:47:11 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-04-25 05:47:11 +0000 |
commit | 39779a7bee18c7489079154d8d72350fb0d74f0b (patch) | |
tree | 3eebb55d146d2cfc2e74d85ff496afa0c6dc0327 /capture_opts.c | |
parent | 35d3fa75bed0add8fbfca7069327a3942552045c (diff) |
Send the output of the -D and -L options to the standard output rather
than the standard error.
In Wireshark on Windows, create a console before doing so and destroy it
before exiting. Don't do that in TShark or dumpcap, as those are
console-mode programs on Windows.
This should fix bug 8609 and still allow "wireshark -D" and "wireshark
-L" to work when the standard output isn't redirected.
svn path=/trunk/; revision=49025
Diffstat (limited to 'capture_opts.c')
-rw-r--r-- | capture_opts.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/capture_opts.c b/capture_opts.c index e3d6b5a246..c37fed6b90 100644 --- a/capture_opts.c +++ b/capture_opts.c @@ -45,7 +45,6 @@ #include "capture_opts.h" #include "ringbuffer.h" #include "clopts_common.h" -#include "console_io.h" #include "cmdarg_err.h" #include "capture_ifinfo.h" @@ -845,19 +844,19 @@ capture_opts_print_if_capabilities(if_capabilities_t *caps, char *name, data_link_info_t *data_link_info; if (caps->can_set_rfmon) - fprintf_stderr("Data link types of interface %s when %sin monitor mode (use option -y to set):\n", - name, monitor_mode ? "" : "not "); + printf("Data link types of interface %s when %sin monitor mode (use option -y to set):\n", + name, monitor_mode ? "" : "not "); else - fprintf_stderr("Data link types of interface %s (use option -y to set):\n", name); + printf("Data link types of interface %s (use option -y to set):\n", name); for (lt_entry = caps->data_link_types; lt_entry != NULL; lt_entry = g_list_next(lt_entry)) { data_link_info = (data_link_info_t *)lt_entry->data; - fprintf_stderr(" %s", data_link_info->name); + printf(" %s", data_link_info->name); if (data_link_info->description != NULL) - fprintf_stderr(" (%s)", data_link_info->description); + printf(" (%s)", data_link_info->description); else - fprintf_stderr(" (not supported)"); - fprintf_stderr("\n"); + printf(" (not supported)"); + printf("\n"); } } @@ -873,17 +872,17 @@ capture_opts_print_interfaces(GList *if_list) for (if_entry = g_list_first(if_list); if_entry != NULL; if_entry = g_list_next(if_entry)) { if_info = (if_info_t *)if_entry->data; - fprintf_stderr("%d. %s", i++, if_info->name); + printf("%d. %s", i++, if_info->name); /* Print the interface friendly name, if it exists; if not fall back to vendor description, if it exists. */ if (if_info->friendly_name != NULL){ - fprintf_stderr(" (%s)", if_info->friendly_name); + printf(" (%s)", if_info->friendly_name); } else { if (if_info->vendor_description != NULL) - fprintf_stderr(" (%s)", if_info->vendor_description); + printf(" (%s)", if_info->vendor_description); } - fprintf_stderr("\n"); + printf("\n"); } } |