diff --git a/ttynvt.c b/ttynvt.c index 000b247..ceed9d8 100644 --- a/ttynvt.c +++ b/ttynvt.c @@ -45,6 +45,7 @@ static struct ttynvt_param { const char *dev_name; char *server; unsigned int debug; + int logstd; /* Derived */ char host[64]; unsigned int port; @@ -86,12 +87,13 @@ _PRF2_ static void _log(int prio, const char *fmt, ...) char buf[256]; va_start(arg, fmt); -#if 0 - vsyslog(prio, fmt, arg); -#else vsnprintf(buf, sizeof(buf), fmt, arg); - syslog(prio, "[%d] %s", gettid(), buf); -#endif + + if (ttynvt_param.logstd) + printf("[%d] %d: %s", gettid(), prio, buf); + else + syslog(prio, "[%d] %s", gettid(), buf); + va_end(arg); } @@ -921,6 +923,7 @@ static const struct cuse_lowlevel_ops ttynvt_op = { static const struct fuse_opt ttynvt_opts[] = { TTYNET_OPT("-D %d", debug, 1), + TTYNET_OPT("-E", logstd, 1), TTYNET_OPT("-M %u", major, 1), TTYNET_OPT("--maj=%u", major, 1), TTYNET_OPT("-m %u", minor, 1), @@ -938,6 +941,7 @@ static void print_help(void) { fprintf(stderr, "ttynvt Usage:\n" "\t-D level\tEnable debug\n" + "\t-E\t\tPrint debug to stdout (default is syslog)\n" "\t-M major, --maj=major\n" "\t-m minor, --min=minor\n" "\t-n name, --name=name (default: ttyNVT0)\n"