Skip to content

Add -log-stderr flag to log to stderr instead of stdout #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acscpt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add -log-stderr flag to log to stderr instead of stdout #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
#include <string.h>

static int s_do_log_to_stdout = 1;

//
// Redirects the stdout log stream to stderr. No effect when
// s_do_log_to_stdout is 0 -- that gate disables terminal logging entirely.
//
static int s_do_log_to_stderr = 0;

static struct util_file* s_p_log_file = NULL;

static const char*
Expand Down Expand Up @@ -74,6 +81,11 @@ log_set_do_log_to_stdout(int do_log_to_stdout) {
s_do_log_to_stdout = do_log_to_stdout;
}

void
log_set_log_to_stderr(void) {
s_do_log_to_stderr = 1;
}

static void
log_do_log_va_list(int module, int severity, const char* p_msg, va_list args) {
char msg[256];
Expand All @@ -92,11 +104,12 @@ log_do_log_va_list(int module, int severity, const char* p_msg, va_list args) {
}

if (s_do_log_to_stdout) {
ret = fprintf(stdout, "%s:%s:%s\n", p_severity_str, p_module_str, msg);
FILE* p_stream = s_do_log_to_stderr ? stderr : stdout;
ret = fprintf(p_stream, "%s:%s:%s\n", p_severity_str, p_module_str, msg);
if (ret <= 0) {
util_bail("fprintf failed");
}
ret = fflush(stdout);
ret = fflush(p_stream);
if (ret != 0) {
util_bail("fflush failed");
}
Expand Down
1 change: 1 addition & 0 deletions log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ enum log_severity {

void log_set_log_filename(const char* p_filename);
void log_set_do_log_to_stdout(int do_log_to_stdout);
void log_set_log_to_stderr(void);

void log_do_log(int module, int severity, const char* p_msg, ...)
__attribute__((format(printf, 3, 4)));
Expand Down
4 changes: 4 additions & 0 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ beebjit_main(void) {
test_map_flag = 1;
} else if (!strcmp(arg, "-no-log-stdout")) {
log_set_do_log_to_stdout(0);
} else if (!strcmp(arg, "-log-stderr")) {
log_set_log_to_stderr();
} else if (!strcmp(arg, "-nula")) {
nula_flag = 1;
} else if (!strcmp(arg, "-version") ||
Expand Down Expand Up @@ -380,6 +382,8 @@ beebjit_main(void) {
"-fast : run CPU as fast as host can; lowers accuracy.\n"
"-accurate : run accurately; only does anything with -fast.\n"
"-log-file <f>: log to file <f> as well as stdout.\n"
"-log-stderr : send log output to stderr rather than default stdout.\n"
" Ignored if -no-log-stdout is set.\n"
"-1770 : emulate a 1770 instead of an 8271 floppy controller.\n"
"-master : set up a Master 128 with MOS 3.20.\n"
"-mos35 : set up a Master 128 with MOS 3.50.\n"
Expand Down