osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wslog: Add a --log-file cmd line option

This commit is contained in:
João Valverde 2021-06-14 18:41:34 +01:00 committed by Wireshark GitLab Utility
parent e86ac706ca
commit b91801a870
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wsutil/wslog.c
View File

@ -11,6 +11,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <time.h>
#include <stdarg.h>
#ifdef HAVE_UNISTD_H
@ -20,6 +21,7 @@
#include <wsutil/ws_assert.h>
#include <wsutil/time_util.h>
#include <wsutil/file_util.h>
#define PREFIX_BUFSIZE 128
@ -155,6 +157,7 @@ enum ws_log_level ws_log_set_level_str(const char *str_level)
static const char *opt_level = "--log-level";
static const char *opt_domains = "--log-domains";
static const char *opt_file = "--log-file";
int ws_log_parse_args(int *argc_ptr, char *argv[], void (*print_err)(const char *, ...))
@ -175,6 +178,10 @@ int ws_log_parse_args(int *argc_ptr, char *argv[], void (*print_err)(const char
option = opt_domains;
optlen = strlen(opt_domains);
}
else if (g_str_has_prefix(*ptr, opt_file)) {
option = opt_file;
optlen = strlen(opt_file);
}
else {
ptr += 1;
count -= 1;
@ -219,6 +226,16 @@ int ws_log_parse_args(int *argc_ptr, char *argv[], void (*print_err)(const char
else if (option == opt_domains) {
ws_log_set_domain_filter_str(value);
}
else if (option == opt_file) {
FILE *fp = ws_fopen(value, "w");
if (fp == NULL) {
print_err("Error opening file '%s' for writing: %s\n", value, g_strerror(errno));
ret += 1;
}
else {
ws_log_add_custom_file(fp);
}
}
/*
* We found a log option. We will remove it from
@ -493,9 +510,6 @@ void ws_log_add_custom_file(FILE *fp)
{
if (custom_log != NULL) {
fclose(custom_log);
custom_log = NULL;
}
if (fp != NULL) {
custom_log = fp;
}
custom_log = fp;
}