aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-05 18:54:16 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-05 18:54:16 +0000
commit82b8853f17b943901776eddcb857089384a61dda (patch)
treed9eb3ac6ef72ee3a7b69c7fa0f3d16e6f6f4d921
parentmain: add --print-pid=FILE|FD (diff)
main: add --print-pid=FILE|FD
When specified, our PID is written to the specified file (or FD), after we've successfully started up.
-rw-r--r--client.c27
-rw-r--r--completions/zsh/_foot2
-rw-r--r--completions/zsh/_footclient1
-rw-r--r--doc/foot.1.scd7
-rw-r--r--doc/footclient.1.scd3
-rw-r--r--log.c25
-rw-r--r--log.h5
-rw-r--r--main.c28
8 files changed, 80 insertions, 18 deletions
diff --git a/client.c b/client.c
index bbb8ea8c..33af8e87 100644
--- a/client.c
+++ b/client.c
@@ -32,15 +32,15 @@ print_usage(const char *prog_name)
printf("Usage: %s [OPTIONS]... -- command\n", prog_name);
printf("\n");
printf("Options:\n");
- printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n"
- " -s,--server-socket=PATH path to the server UNIX domain socket (default=XDG_RUNTIME_DIR/foot.sock)\n"
- " -v,--version show the version number and quit\n");
+ printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n"
+ " -s,--server-socket=PATH path to the server UNIX domain socket (default=XDG_RUNTIME_DIR/foot.sock)\n"
+ " -l,--log-colorize=[never|always|auto] enable/disable colorization of log output on stderr\n"
+ " -v,--version show the version number and quit\n");
}
int
main(int argc, char *const *argv)
{
- log_init(LOG_FACILITY_USER, LOG_CLASS_WARNING);
int ret = EXIT_FAILURE;
const char *const prog_name = argv[0];
@@ -48,6 +48,7 @@ main(int argc, char *const *argv)
static const struct option longopts[] = {
{"term", required_argument, 0, 't'},
{"server-socket", required_argument, 0, 's'},
+ {"log-colorize", optional_argument, NULL, 'l'},
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{NULL, no_argument, 0, 0},
@@ -55,9 +56,10 @@ main(int argc, char *const *argv)
const char *term = "";
const char *server_socket_path = NULL;
+ enum log_colorize log_colorize = LOG_COLORIZE_AUTO;
while (true) {
- int c = getopt_long(argc, argv, ":t:s:hv", longopts, NULL);
+ int c = getopt_long(argc, argv, ":t:s:l::hv", longopts, NULL);
if (c == -1)
break;
@@ -70,6 +72,19 @@ main(int argc, char *const *argv)
server_socket_path = optarg;
break;
+ case 'l':
+ if (optarg == NULL || strcmp(optarg, "auto") == 0)
+ log_colorize = LOG_COLORIZE_AUTO;
+ else if (strcmp(optarg, "never") == 0)
+ log_colorize = LOG_COLORIZE_NEVER;
+ else if (strcmp(optarg, "always") == 0)
+ log_colorize = LOG_COLORIZE_ALWAYS;
+ else {
+ fprintf(stderr, "%s: argument must be one of 'never', 'always' or 'auto'\n", optarg);
+ return EXIT_FAILURE;
+ }
+ break;
+
case 'v':
printf("footclient version %s\n", FOOT_VERSION);
return EXIT_SUCCESS;
@@ -91,6 +106,8 @@ main(int argc, char *const *argv)
argc -= optind;
argv += optind;
+ log_init(log_colorize, false, LOG_FACILITY_USER, LOG_CLASS_WARNING);
+
int fd = socket(AF_UNIX, SOCK_STREAM, 0);
if (fd == -1) {
LOG_ERRNO("failed to create socket");
diff --git a/completions/zsh/_foot b/completions/zsh/_foot
index 3b068f7f..9f79a730 100644
--- a/completions/zsh/_foot
+++ b/completions/zsh/_foot
@@ -9,6 +9,8 @@ _arguments \
'(-s --server)'{-s,--server}'[run as server; open terminals by running footclient]:server:_files' \
'--hold[remain open after child process exits]' \
'(-p --print-pid)'{-p,--print-pid}'[print PID to this file or FD when up and running (server mode only)]:pidfile:_files' \
+ '(-l --log-colorize)'{-l,--log-colorize}'[enable or disable colorization of log output on stderr]:logcolor:(never always auto)' \
+ '(-S --log-no-syslog)'{-s,--log-no-syslog}'[disable syslog logging (server mode only)]' \
'(-v --version)'{-v,--version}'[show the version number and quit]' \
'(-h --help)'{-h,--help}'[show help message and quit]'
diff --git a/completions/zsh/_footclient b/completions/zsh/_footclient
index 81e293ed..9b3eb3fe 100644
--- a/completions/zsh/_footclient
+++ b/completions/zsh/_footclient
@@ -4,6 +4,7 @@ _arguments \
-s \
'(-t --term)'{-t,--term}'[value to set the environment variable TERM to (foot)]:term:->terms' \
'(-s --server-socket)'{-s,--server-socket}'[override the default path to the foot server socket (XDG_RUNTIME_DIR/foot.sock)]:server:_files' \
+ '(-l --log-colorize)'{-l,--log-colorize}'[enable or disable colorization of log output on stderr]:logcolor:(never always auto)' \
'(-v --version)'{-v,--version}'[show the version number and quit]' \
'(-h --help)'{-h,--help}'[show help message and quit]'
diff --git a/doc/foot.1.scd b/doc/foot.1.scd
index b555ba90..8e708af9 100644
--- a/doc/foot.1.scd
+++ b/doc/foot.1.scd
@@ -72,6 +72,13 @@ execute (instead of the shell).
This option can only be used in combination with *-s*,*--server*.
+*-l*,*--log-colorize*=[{*never*,*always*,*auto*}]
+ Enables or disables colorization of log output on stderr.
+
+*-S*,*--log-no-syslog*
+ Disables syslog logging. Logging is only done on stderr. This
+ option can only be used in combination with *-s*,*--server*.
+
*-v*,*--version*
Show the version number and quit.
diff --git a/doc/footclient.1.scd b/doc/footclient.1.scd
index 78397544..e58be6a1 100644
--- a/doc/footclient.1.scd
+++ b/doc/footclient.1.scd
@@ -18,6 +18,9 @@ execute (instead of the shell).
*-s*,*--server-socket*=_PATH_
Connect to _PATH_ instead of _XDG\_RUNTIME\_DIR/foot.sock_.
+*-l*,*--log-colorize*=[{*never*,*always*,*auto*}]
+ Enables or disables colorization of log output on stderr.
+
*-v*,*--version*
Show the version number and quit
diff --git a/log.c b/log.c
index 6d6b9668..4962f012 100644
--- a/log.c
+++ b/log.c
@@ -12,15 +12,11 @@
#include <syslog.h>
static bool colorize = false;
-
-static void __attribute__((constructor))
-init(void)
-{
- colorize = isatty(STDERR_FILENO);
-}
+static bool do_syslog = true;
void
-log_init(enum log_facility syslog_facility, enum log_class syslog_level)
+log_init(enum log_colorize _colorize, bool _do_syslog,
+ enum log_facility syslog_facility, enum log_class syslog_level)
{
static const int facility_map[] = {
[LOG_FACILITY_USER] = LOG_USER,
@@ -34,14 +30,20 @@ log_init(enum log_facility syslog_facility, enum log_class syslog_level)
[LOG_CLASS_DEBUG] = LOG_DEBUG,
};
- openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]);
- setlogmask(LOG_UPTO(level_map[syslog_level]));
+ colorize = _colorize == LOG_COLORIZE_NEVER ? false : _colorize == LOG_COLORIZE_ALWAYS ? true : isatty(STDERR_FILENO);
+ do_syslog = _do_syslog;
+
+ if (do_syslog) {
+ openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]);
+ setlogmask(LOG_UPTO(level_map[syslog_level]));
+ }
}
void
log_deinit(void)
{
- closelog();
+ if (do_syslog)
+ closelog();
}
static void
@@ -85,6 +87,9 @@ _sys_log(enum log_class log_class, const char *module,
int lineno __attribute__((unused)),
const char *fmt, int sys_errno, va_list va)
{
+ if (!do_syslog)
+ return;
+
/* Map our log level to syslog's level */
int level = -1;
switch (log_class) {
diff --git a/log.h b/log.h
index eb8a9d21..dfddd765 100644
--- a/log.h
+++ b/log.h
@@ -1,9 +1,12 @@
#pragma once
+#include <stdbool.h>
+enum log_colorize { LOG_COLORIZE_NEVER, LOG_COLORIZE_ALWAYS, LOG_COLORIZE_AUTO };
enum log_facility { LOG_FACILITY_USER, LOG_FACILITY_DAEMON };
enum log_class { LOG_CLASS_ERROR, LOG_CLASS_WARNING, LOG_CLASS_INFO, LOG_CLASS_DEBUG };
-void log_init(enum log_facility syslog_facility, enum log_class syslog_level);
+void log_init(enum log_colorize colorize, bool do_syslog,
+ enum log_facility syslog_facility, enum log_class syslog_level);
void log_deinit(void);
void log_msg(enum log_class log_class, const char *module,
diff --git a/main.c b/main.c
index 0c127e84..25a51897 100644
--- a/main.c
+++ b/main.c
@@ -51,6 +51,8 @@ print_usage(const char *prog_name)
" Without PATH, XDG_RUNTIME_DIR/foot.sock will be used.\n"
" --hold remain open after child process exits\n"
" -p,--print-pid=FILE|FD print PID to file or FD (only applicable in server mode)\n"
+ " -l,--log-colorize=[never|always|auto] enable/disable colorization of log output on stderr\n"
+ " -s,--log-no-syslog disable syslog logging (only applicable in server mode)\n"
" -v,--version show the version number and quit\n",
prog_name, prog_name);
}
@@ -140,6 +142,8 @@ main(int argc, char *const *argv)
{"hold", no_argument, NULL, 'H'},
{"presentation-timings", no_argument, NULL, 'P'}, /* Undocumented */
{"print-pid", required_argument, NULL, 'p'},
+ {"log-colorize", optional_argument, NULL, 'l'},
+ {"log-no-syslog", no_argument, NULL, 'S'},
{"version", no_argument, NULL, 'v'},
{"help", no_argument, NULL, 'h'},
{NULL, no_argument, NULL, 0},
@@ -156,9 +160,11 @@ main(int argc, char *const *argv)
bool hold = false;
bool unlink_pid_file = false;
const char *pid_file = NULL;
+ enum log_colorize log_colorize = LOG_COLORIZE_AUTO;
+ bool log_syslog = true;
while (true) {
- int c = getopt_long(argc, argv, "c:tf:g:s::pvh", longopts, NULL);
+ int c = getopt_long(argc, argv, "c:tf:g:s::Pp:l::Svh", longopts, NULL);
if (c == -1)
break;
@@ -223,6 +229,23 @@ main(int argc, char *const *argv)
pid_file = optarg;
break;
+ case 'l':
+ if (optarg == NULL || strcmp(optarg, "auto") == 0)
+ log_colorize = LOG_COLORIZE_AUTO;
+ else if (strcmp(optarg, "never") == 0)
+ log_colorize = LOG_COLORIZE_NEVER;
+ else if (strcmp(optarg, "always") == 0)
+ log_colorize = LOG_COLORIZE_ALWAYS;
+ else {
+ fprintf(stderr, "%s: argument must be one of 'never', 'always' or 'auto'\n", optarg);
+ return EXIT_FAILURE;
+ }
+ break;
+
+ case 'S':
+ log_syslog = false;
+ break;
+
case 'v':
printf("foot version %s\n", FOOT_VERSION);
return EXIT_SUCCESS;
@@ -236,7 +259,8 @@ main(int argc, char *const *argv)
}
}
- log_init(as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER, LOG_CLASS_WARNING);
+ log_init(log_colorize, as_server && log_syslog,
+ as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER, LOG_CLASS_WARNING);
argc -= optind;
argv += optind;