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 b48bad4c468a38068df2d504a7133d57e7ca4b8b..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;
@@
-1184,8
+1185,11
@@
char *strnappend(const char *s, const char *suffix, size_t b) {
assert(suffix);
a = strlen(s);
assert(suffix);
a = strlen(s);
+ if (b > ((size_t) -1) - a)
+ return NULL;
- if (!(r = new(char, a+b+1)))
+ r = new(char, a+b+1);
+ if (!r)
return NULL;
memcpy(r, s, a);
return NULL;
memcpy(r, s, a);
@@
-3737,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))
@@
-3773,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);
@@
-5014,12
+5023,19
@@
char *strjoin(const char *x, ...) {
for (;;) {
const char *t;
for (;;) {
const char *t;
+ size_t n;
t = va_arg(ap, const char *);
if (!t)
break;
t = va_arg(ap, const char *);
if (!t)
break;
- l += strlen(t);
+ n = strlen(t);
+ if (n > ((size_t) -1) - l) {
+ va_end(ap);
+ return NULL;
+ }
+
+ l += n;
}
} else
l = 0;
}
} else
l = 0;
@@
-5291,7
+5307,7
@@
int signal_from_string(const char *s) {
int offset = 0;
unsigned u;
int offset = 0;
unsigned u;
- signo =__signal_from_string(s);
+ signo =
__signal_from_string(s);
if (signo > 0)
return signo;
if (signo > 0)
return signo;
@@
-5683,7
+5699,7
@@
void warn_melody(void) {
if (fd < 0)
return;
if (fd < 0)
return;
- /* Yeah, this is synchronous. Kinda sucks. But
e
well... */
+ /* Yeah, this is synchronous. Kinda sucks. But well... */
ioctl(fd, KIOCSOUND, (int)(1193180/440));
usleep(125*USEC_PER_MSEC);
ioctl(fd, KIOCSOUND, (int)(1193180/440));
usleep(125*USEC_PER_MSEC);