chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journalctl: reset cached column count on SIGWINCH
[elogind.git]
/
src
/
shared
/
util.c
diff --git
a/src/shared/util.c
b/src/shared/util.c
index 97f766c33c5b043559472d3b6817d442626c4bc1..e0156868ade4e4259af439ab3fa5b9c77236cfa6 100644
(file)
--- a/
src/shared/util.c
+++ b/
src/shared/util.c
@@
-70,6
+70,7
@@
int saved_argc = 0;
char **saved_argv = NULL;
int saved_argc = 0;
char **saved_argv = NULL;
+int parsed_columns = 0;
size_t page_size(void) {
static __thread size_t pgsz = 0;
size_t page_size(void) {
static __thread size_t pgsz = 0;
@@
-3740,7
+3741,7
@@
int fd_columns(int fd) {
}
static unsigned columns_cached(bool cached) {
}
static unsigned columns_cached(bool cached) {
- static __thread int
parsed_columns = 0,
env_columns = -1;
+ static __thread int env_columns = -1;
const char *e;
if (_likely_(parsed_columns > 0 && cached))
const char *e;
if (_likely_(parsed_columns > 0 && cached))
@@
-3776,6
+3777,11
@@
unsigned columns_uncached(void) {
return columns_cached(false);
}
return columns_cached(false);
}
+/* intended to be used as a SIGWINCH sighandler */
+void columns_cache_reset(int signum) {
+ parsed_columns = 0;
+}
+
int fd_lines(int fd) {
struct winsize ws;
zero(ws);
int fd_lines(int fd) {
struct winsize ws;
zero(ws);