Optionally print debug to stdout

This commit is contained in:
Kim Woelders
2018-10-15 11:15:21 +02:00
parent e8913f62af
commit d85251400f
+9 -5
View File
@@ -45,6 +45,7 @@ static struct ttynvt_param {
const char *dev_name; const char *dev_name;
char *server; char *server;
unsigned int debug; unsigned int debug;
int logstd;
/* Derived */ /* Derived */
char host[64]; char host[64];
unsigned int port; unsigned int port;
@@ -86,12 +87,13 @@ _PRF2_ static void _log(int prio, const char *fmt, ...)
char buf[256]; char buf[256];
va_start(arg, fmt); va_start(arg, fmt);
#if 0
vsyslog(prio, fmt, arg);
#else
vsnprintf(buf, sizeof(buf), fmt, arg); 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); va_end(arg);
} }
@@ -921,6 +923,7 @@ static const struct cuse_lowlevel_ops ttynvt_op = {
static const struct fuse_opt ttynvt_opts[] = { static const struct fuse_opt ttynvt_opts[] = {
TTYNET_OPT("-D %d", debug, 1), TTYNET_OPT("-D %d", debug, 1),
TTYNET_OPT("-E", logstd, 1),
TTYNET_OPT("-M %u", major, 1), TTYNET_OPT("-M %u", major, 1),
TTYNET_OPT("--maj=%u", major, 1), TTYNET_OPT("--maj=%u", major, 1),
TTYNET_OPT("-m %u", minor, 1), TTYNET_OPT("-m %u", minor, 1),
@@ -938,6 +941,7 @@ static void print_help(void)
{ {
fprintf(stderr, "ttynvt Usage:\n" fprintf(stderr, "ttynvt Usage:\n"
"\t-D level\tEnable debug\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 major, --maj=major\n"
"\t-m minor, --min=minor\n" "\t-m minor, --min=minor\n"
"\t-n name, --name=name (default: ttyNVT0)\n" "\t-n name, --name=name (default: ttyNVT0)\n"